Move TestMetalContext/Surface to testing namespace

testing/assertions.h

@@ -7,15 +7,13 @@
 
 #include <type_traits>
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 inline bool NumberNear(double a, double b) {
   static const double epsilon = 1e-3;
   return (a > (b - epsilon)) && (a < (b + epsilon));
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_ASSERTIONS_H_

testing/canvas_test.h

@@ -9,8 +9,7 @@
 #include "gtest/gtest.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 // This fixture allows creating tests that make use of a mock |SkCanvas|.
 template <typename BaseT>
@@ -27,7 +26,6 @@ class CanvasTestBase : public BaseT {
 };
 using CanvasTest = CanvasTestBase<::testing::Test>;
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_CANVAS_TEST_H_

testing/dart_isolate_runner.cc

@@ -8,8 +8,8 @@
 
 #include "flutter/runtime/isolate_configuration.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
+
 AutoIsolateShutdown::AutoIsolateShutdown(std::shared_ptr<DartIsolate> isolate,
                                          fml::RefPtr<fml::TaskRunner> runner)
     : isolate_(std::move(isolate)), runner_(std::move(runner)) {}
@@ -173,5 +173,4 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolate(
   return result;
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/dart_isolate_runner.h

@@ -14,8 +14,7 @@
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/runtime/dart_vm_lifecycle.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 class AutoIsolateShutdown {
  public:
@@ -66,7 +65,6 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolate(
     fml::WeakPtr<IOManager> io_manager = {},
     std::unique_ptr<PlatformConfiguration> platform_configuration = nullptr);
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_DART_ISOLATE_RUNNER_H_

testing/debugger_detection.cc

@@ -19,8 +19,7 @@
 #include <windows.h>
 #endif  // FML_OS_WIN
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 DebuggerStatus GetDebuggerStatus() {
 #if FML_OS_MACOSX
@@ -61,7 +60,6 @@ DebuggerStatus GetDebuggerStatus() {
 #else
   return DebuggerStatus::kDontKnow;
 #endif
-}  // namespace testing
+}
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/debugger_detection.h

@@ -7,8 +7,7 @@
 
 #include "flutter/fml/macros.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 enum class DebuggerStatus {
   kDontKnow,
@@ -17,7 +16,6 @@ enum class DebuggerStatus {
 
 DebuggerStatus GetDebuggerStatus();
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_DEBUGGER_DETECTION_H_

testing/display_list_testing.cc

@@ -10,8 +10,7 @@
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/effects/dl_image_filter.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 // clang-format off
 bool DisplayListsEQ_Verbose(const DisplayList* a, const DisplayList* b) {
@@ -37,8 +36,7 @@ bool DisplayListsNE_Verbose(const DisplayList* a, const DisplayList* b) {
   return true;
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 namespace std {
 
@@ -389,8 +387,7 @@ std::ostream& operator<<(std::ostream& os, const DlImage* image) {
 
 }  // namespace std
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 std::ostream& DisplayListStreamDispatcher::startl() {
   for (int i = 0; i < cur_indent_; i++) {
@@ -978,5 +975,4 @@ void DisplayListStreamDispatcher::drawShadow(const DlPath& path,
 }
 // clang-format on
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/display_list_testing.h

@@ -11,8 +11,7 @@
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/dl_op_receiver.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 [[nodiscard]] bool DisplayListsEQ_Verbose(const DisplayList* a,
                                           const DisplayList* b);
@@ -37,8 +36,7 @@ namespace testing {
   return DisplayListsNE_Verbose(a.get(), b.get());
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 namespace std {
 
@@ -84,8 +82,7 @@ extern std::ostream& operator<<(std::ostream& os, const flutter::DlPath& path);
 
 }  // namespace std
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 class DisplayListStreamDispatcher final : public DlOpReceiver {
  public:
@@ -609,7 +606,6 @@ class DisplayListGeneralReceiver : public DlOpReceiver {
   uint32_t op_count_ = 0u;
 };
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_

testing/elf_loader.cc

@@ -11,8 +11,7 @@
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/testing/testing.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 ELFAOTSymbols LoadELFSymbolFromFixturesIfNeccessary(std::string elf_filename) {
   if (!DartVM::IsRunningPrecompiledCode()) {
@@ -135,5 +134,4 @@ bool PrepareSettingsForAOTWithSymbols(Settings& settings,
   return true;
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/elf_loader.h

@@ -11,8 +11,7 @@
 #include "flutter/fml/macros.h"
 #include "third_party/dart/runtime/bin/elf_loader.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 inline constexpr const char* kDefaultAOTAppELFFileName = "app_elf_snapshot.so";
 
@@ -81,7 +80,6 @@ ELFAOTSymbols LoadELFSplitSymbolFromFixturesIfNeccessary(
 bool PrepareSettingsForAOTWithSymbols(Settings& settings,
                                       const ELFAOTSymbols& symbols);
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_ELF_LOADER_H_

testing/fixture_test.cc

@@ -8,8 +8,7 @@
 
 #include "flutter/testing/dart_fixture.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 FixtureTest::FixtureTest() : DartFixture() {}
 
@@ -20,5 +19,4 @@ FixtureTest::FixtureTest(std::string kernel_filename,
                   std::move(elf_filename),
                   std::move(elf_split_filename)) {}
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/fixture_test.h

@@ -7,8 +7,7 @@
 
 #include "flutter/testing/dart_fixture.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 class FixtureTest : public DartFixture, public ThreadTest {
  public:
@@ -24,7 +23,6 @@ class FixtureTest : public DartFixture, public ThreadTest {
   FML_DISALLOW_COPY_AND_ASSIGN(FixtureTest);
 };
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_FIXTURE_TEST_H_

testing/post_task_sync.cc

@@ -6,8 +6,7 @@
 
 #include "flutter/fml/synchronization/waitable_event.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 void PostTaskSync(const fml::RefPtr<fml::TaskRunner>& task_runner,
                   const std::function<void()>& function) {
@@ -19,5 +18,4 @@ void PostTaskSync(const fml::RefPtr<fml::TaskRunner>& task_runner,
   latch.Wait();
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/post_task_sync.h

@@ -7,13 +7,11 @@
 
 #include "flutter/fml/task_runner.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 void PostTaskSync(const fml::RefPtr<fml::TaskRunner>& task_runner,
                   const std::function<void()>& function);
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_POST_TASK_SYNC_H_

testing/stream_capture.cc

@@ -4,8 +4,7 @@
 
 #include "flutter/testing/stream_capture.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 StreamCapture::StreamCapture(std::ostream* ostream)
     : ostream_(ostream), old_buffer_(ostream_->rdbuf()) {
@@ -27,5 +26,4 @@ std::string StreamCapture::GetOutput() const {
   return buffer_.str();
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/stream_capture.h

@@ -9,8 +9,7 @@
 #include <sstream>
 #include <string>
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 // Temporarily replaces the specified stream's output buffer to capture output.
 //
@@ -41,7 +40,6 @@ class StreamCapture {
   std::streambuf* old_buffer_;
 };
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_STREAM_CAPTURE_H_

testing/test_args.cc

@@ -4,8 +4,7 @@
 
 #include "flutter/testing/test_args.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 static fml::CommandLine gProcessArgs;
 
@@ -17,5 +16,4 @@ void SetArgsForProcess(int argc, char** argv) {
   gProcessArgs = fml::CommandLineFromArgcArgv(argc, argv);
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/test_args.h

@@ -7,14 +7,12 @@
 
 #include "flutter/fml/command_line.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 const fml::CommandLine& GetArgsForProcess();
 
 void SetArgsForProcess(int argc, char** argv);
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_TEST_ARGS_H_

testing/test_dart_native_resolver.cc

@@ -11,8 +11,7 @@
 #include "third_party/tonic/logging/dart_error.h"
 #include "tonic/converter/dart_converter.h"
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 TestDartNativeResolver::TestDartNativeResolver() = default;
 
@@ -124,5 +123,4 @@ void TestDartNativeResolver::SetNativeResolverForIsolate() {
   }
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing

testing/test_dart_native_resolver.h

@@ -23,8 +23,7 @@
     return entrypoint;                                                      \
   })()
 
-namespace flutter {
-namespace testing {
+namespace flutter::testing {
 
 using NativeEntry = std::function<void(Dart_NativeArguments)>;
 
@@ -56,7 +55,6 @@ class TestDartNativeResolver
   FML_DISALLOW_COPY_AND_ASSIGN(TestDartNativeResolver);
 };
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace flutter::testing
 
 #endif  // FLUTTER_TESTING_TEST_DART_NATIVE_RESOLVER_H_