Remove namespace test in components/viz/*

Delete some usage of "namespace test" in components/viz/* that got added
back in the year or so since we originally decided to not use it.

Bug: 893850
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: Ic4a0c134c6c7dd66d4f1eb89526155111c1f2a10
Reviewed-on: https://chromium-review.googlesource.com/c/1276546
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599673}

components/viz/service/frame_sinks/compositor_frame_sink_support.h

@@ -28,10 +28,6 @@
 
 namespace viz {
 
-namespace test {
-class FrameSinkManagerTest;
-}
-
 class FrameSinkManagerImpl;
 class LatestLocalSurfaceIdLookupDelegate;
 class Surface;
@@ -171,7 +167,7 @@ class VIZ_SERVICE_EXPORT CompositorFrameSinkSupport
   static const char* GetSubmitResultAsString(SubmitResult result);
 
  private:
-  friend class test::FrameSinkManagerTest;
+  friend class FrameSinkManagerTest;
 
   SubmitResult MaybeSubmitCompositorFrameInternal(
       const LocalSurfaceId& local_surface_id,

components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc

@@ -33,7 +33,6 @@ using testing::_;
 using testing::Eq;
 
 namespace viz {
-namespace test {
 namespace {
 
 constexpr bool kIsRoot = false;
@@ -1122,5 +1121,4 @@ TEST_F(CompositorFrameSinkSupportTest,
   support_->SubmitCompositorFrame(local_surface_id, std::move(frame));
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/frame_sinks/frame_sink_manager_impl.h

@@ -39,10 +39,6 @@
 
 namespace viz {
 
-namespace test {
-class FrameSinkManagerTest;
-}  // namespace test
-
 class CapturableFrameSink;
 class CompositorFrameSinkSupport;
 class DisplayProvider;
@@ -192,7 +188,7 @@ class VIZ_SERVICE_EXPORT FrameSinkManagerImpl
       const FrameSinkId& frame_sink_id) const;
 
  private:
-  friend class test::FrameSinkManagerTest;
+  friend class FrameSinkManagerTest;
 
   // Metadata for a CompositorFrameSink.
   struct FrameSinkData {

components/viz/service/frame_sinks/frame_sink_manager_unittest.cc

@@ -23,8 +23,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {
-namespace test {
-
 namespace {
 
 constexpr FrameSinkId kFrameSinkIdRoot(1, 1);
@@ -650,5 +648,4 @@ INSTANTIATE_TEST_CASE_P(
                        ::testing::ValuesIn(kUnregisterOrderList),
                        ::testing::ValuesIn(kBFSOrderList)));
 
-}  // namespace test
 }  // namespace viz

components/viz/service/frame_sinks/surface_references_unittest.cc

@@ -25,7 +25,6 @@ using testing::SizeIs;
 using testing::UnorderedElementsAre;
 
 namespace viz {
-namespace test {
 namespace {
 
 constexpr FrameSinkId kFrameSink1(1, 0);
@@ -545,5 +544,4 @@ TEST_F(SurfaceReferencesTest, MarkOldTemporaryReferences) {
   EXPECT_FALSE(IsTemporaryReferenceTimerRunning());
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/frame_sinks/surface_synchronization_unittest.cc

@@ -22,7 +22,6 @@ using testing::IsEmpty;
 using testing::UnorderedElementsAre;
 
 namespace viz {
-namespace test {
 namespace {
 
 constexpr bool kIsRoot = true;
@@ -3001,5 +3000,4 @@ TEST_F(SurfaceSynchronizationTest,
   EXPECT_TRUE(IsMarkedForDestruction(child_id2));
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/gl/gpu_service_impl_unittest.cc

@@ -17,7 +17,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {
-namespace test {
 
 class GpuServiceTest : public testing::Test {
  public:
@@ -96,5 +95,4 @@ TEST_F(GpuServiceTest, ServiceDestroyedAfterBind) {
   DestroyService();
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/hit_test/hit_test_aggregator.h

@@ -13,9 +13,6 @@
 
 namespace viz {
 
-namespace test {
-class TestHitTestAggregator;
-}  // namespace test
 class HitTestAggregatorDelegate;
 struct HitTestRegion;
 
@@ -42,7 +39,7 @@ class VIZ_SERVICE_EXPORT HitTestAggregator {
   void Aggregate(const SurfaceId& display_surface_id);
 
  private:
-  friend class test::TestHitTestAggregator;
+  friend class TestHitTestAggregator;
 
   void SendHitTestData();
 

components/viz/service/hit_test/hit_test_aggregator_unittest.cc

@@ -21,8 +21,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {
-namespace test {
-
 namespace {
 
 constexpr uint32_t kDisplayClientId = 2;
@@ -34,8 +32,6 @@ SurfaceId MakeSurfaceId(uint32_t frame_sink_id_client_id) {
       LocalSurfaceId(1, base::UnguessableToken::Deserialize(0, 1u)));
 }
 
-}  // namespace
-
 // TODO(riajiang): TestHostFrameSinkManager should be based on
 // mojom::FrameSinkManagerClient instead.
 class TestHostFrameSinkManager : public HostFrameSinkManager {
@@ -87,6 +83,8 @@ class TestFrameSinkManagerImpl : public FrameSinkManagerImpl {
   DISALLOW_COPY_AND_ASSIGN(TestFrameSinkManagerImpl);
 };
 
+}  // namespace
+
 class TestHitTestAggregator final : public HitTestAggregator {
  public:
   TestHitTestAggregator(
@@ -1014,5 +1012,4 @@ TEST_F(HitTestAggregatorTest, DiscardedSurfaces) {
       local_surface_id_lookup_delegate(), c_surface_id.frame_sink_id()));
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/surfaces/referenced_surface_tracker_unittest.cc

@@ -19,7 +19,6 @@ using testing::UnorderedElementsAre;
 using testing::IsEmpty;
 
 namespace viz {
-namespace test {
 namespace {
 
 constexpr FrameSinkId kParentFrameSink(2, 1);
@@ -142,5 +141,4 @@ TEST_F(ReferencedSurfaceTrackerTest, AddTwoThenRemoveOneSurfaceReferences) {
   EXPECT_THAT(references_to_add(), IsEmpty());
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/surfaces/surface_dependency_deadline_unittest.cc

@@ -12,7 +12,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {
-namespace test {
 
 class FakeSurfaceDeadlineClient : public SurfaceDeadlineClient {
  public:
@@ -197,5 +196,4 @@ TEST_F(SurfaceDependencyDeadlineTest, InheritDeadlineWithActiveDeadline) {
   EXPECT_GT(duration1, duration2);
 }
 
-}  // namespace test
 }  // namespace viz

components/viz/service/surfaces/surface_manager.h

@@ -38,14 +38,6 @@ class TickClock;
 
 namespace viz {
 
-namespace test {
-class CompositorFrameSinkSupportTest;
-class FrameSinkManagerTest;
-class HitTestAggregatorTest;
-class SurfaceReferencesTest;
-class SurfaceSynchronizationTest;
-}  // namespace test
-
 class Surface;
 struct BeginFrameAck;
 struct BeginFrameArgs;
@@ -206,12 +198,12 @@ class VIZ_SERVICE_EXPORT SurfaceManager {
   void SurfaceWillBeDrawn(Surface* surface);
 
  private:
-  friend class test::CompositorFrameSinkSupportTest;
-  friend class test::FrameSinkManagerTest;
-  friend class test::HitTestAggregatorTest;
-  friend class test::SurfaceSynchronizationTest;
-  friend class test::SurfaceReferencesTest;
-  friend class test::SurfaceSynchronizationTest;
+  friend class CompositorFrameSinkSupportTest;
+  friend class FrameSinkManagerTest;
+  friend class HitTestAggregatorTest;
+  friend class SurfaceSynchronizationTest;
+  friend class SurfaceReferencesTest;
+  friend class SurfaceSynchronizationTest;
 
   using SurfaceIdSet = std::unordered_set<SurfaceId, SurfaceIdHash>;