WIP: Towards merging OffscreenCanvas and Mus code

content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
index 6bd8388199888778cfbbb14759b903c0f3256927..6d95382421e93fac0845e81bbe92276fe90b086d 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/message_loop/message_loop.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
+#include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.h"
 #include "content/browser/renderer_host/offscreen_canvas_surface_impl.h"
-#include "content/browser/renderer_host/offscreen_canvas_surface_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,15 +20,15 @@
 
 namespace content {
 
-class OffscreenCanvasSurfaceManagerTest : public testing::Test {
+class OffscreenCanvasCompositorFrameSinkManagerTest : public testing::Test {
  public:
   int getNumSurfaceImplInstances() {
-    return OffscreenCanvasSurfaceManager::GetInstance()
+    return OffscreenCanvasCompositorFrameSinkManager::GetInstance()
         ->registered_surface_instances_.size();
   }
 
   void OnSurfaceCreated(const cc::SurfaceId& surface_id) {
-    OffscreenCanvasSurfaceManager::GetInstance()->OnSurfaceCreated(
+    OffscreenCanvasCompositorFrameSinkManager::GetInstance()->OnSurfaceCreated(
         cc::SurfaceInfo(surface_id, 1.0f, gfx::Size(10, 10)));
   }
 
@@ -44,7 +44,7 @@ class OffscreenCanvasSurfaceManagerTest : public testing::Test {
 #endif
 };
 
-void OffscreenCanvasSurfaceManagerTest::SetUp() {
+void OffscreenCanvasCompositorFrameSinkManagerTest::SetUp() {
 #if defined(OS_ANDROID)
   ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
   ui::ContextProviderFactory::SetInstance(
@@ -57,7 +57,7 @@ void OffscreenCanvasSurfaceManagerTest::SetUp() {
   ui_thread_.reset(new TestBrowserThread(BrowserThread::UI, &message_loop_));
 }
 
-void OffscreenCanvasSurfaceManagerTest::TearDown() {
+void OffscreenCanvasCompositorFrameSinkManagerTest::TearDown() {
 #if defined(OS_ANDROID)
   ui::ContextProviderFactory::SetInstance(nullptr);
   ContextProviderFactoryImpl::Terminate();
@@ -68,7 +68,7 @@ void OffscreenCanvasSurfaceManagerTest::TearDown() {
 
 // This test mimics the workflow of OffscreenCanvas.commit() on renderer
 // process.
-TEST_F(OffscreenCanvasSurfaceManagerTest,
+TEST_F(OffscreenCanvasCompositorFrameSinkManagerTest,
        SingleHTMLCanvasElementTransferToOffscreen) {
   cc::mojom::DisplayCompositorClientPtr client;
   cc::FrameSinkId frame_sink_id(3, 3);
@@ -80,8 +80,8 @@ TEST_F(OffscreenCanvasSurfaceManagerTest,
       cc::FrameSinkId(), frame_sink_id, std::move(client)));
   EXPECT_EQ(1, this->getNumSurfaceImplInstances());
   EXPECT_EQ(surface_impl.get(),
-            OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
-                frame_sink_id));
+            OffscreenCanvasCompositorFrameSinkManager::GetInstance()
+                ->GetSurfaceInstance(frame_sink_id));
 
   this->OnSurfaceCreated(
       cc::SurfaceId(frame_sink_id, current_local_surface_id));
@@ -91,7 +91,7 @@ TEST_F(OffscreenCanvasSurfaceManagerTest,
   EXPECT_EQ(0, this->getNumSurfaceImplInstances());
 }
 
-TEST_F(OffscreenCanvasSurfaceManagerTest,
+TEST_F(OffscreenCanvasCompositorFrameSinkManagerTest,
        MultiHTMLCanvasElementTransferToOffscreen) {
   cc::mojom::DisplayCompositorClientPtr client_a;
   cc::FrameSinkId dummy_parent_frame_sink_id(0, 0);
@@ -108,11 +108,11 @@ TEST_F(OffscreenCanvasSurfaceManagerTest,
 
   EXPECT_EQ(2, this->getNumSurfaceImplInstances());
   EXPECT_EQ(surface_impl_a.get(),
-            OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
-                frame_sink_id_a));
+            OffscreenCanvasCompositorFrameSinkManager::GetInstance()
+                ->GetSurfaceInstance(frame_sink_id_a));
   EXPECT_EQ(surface_impl_b.get(),
-            OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
-                frame_sink_id_b));
+            OffscreenCanvasCompositorFrameSinkManager::GetInstance()
+                ->GetSurfaceInstance(frame_sink_id_b));
 
   surface_impl_a = nullptr;
   EXPECT_EQ(1, this->getNumSurfaceImplInstances());