Move TestMetalContext/Surface to testing namespace (flutter/engine#56602)

The Metal context/surface code was only in the `flutter` namespace but should have been in `flutter::testing` for consistency with everything else in the `testing` directory.

Also squashes the declarations in the rest of that directory to match the style guide while I've got the macro still handy.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

Author: cbracken

engine/src/flutter/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_

engine/src/flutter/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_

engine/src/flutter/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

engine/src/flutter/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_

engine/src/flutter/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

engine/src/flutter/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_

engine/src/flutter/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

engine/src/flutter/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_

engine/src/flutter/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

engine/src/flutter/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_