WIP: Towards merging OffscreenCanvas and Mus code

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
index 4bc06e0e61ab677caf8fe60387e0358575433d6b..adef5ba56468a8a0b1796c63c5d4f4920db7d165 100644
--- a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
@@ -7,7 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h"
-#include "content/browser/renderer_host/offscreen_canvas_surface_manager.h"
+#include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace content {
@@ -31,8 +31,8 @@ void OffscreenCanvasCompositorFrameSinkProviderImpl::CreateCompositorFrameSink(
       base::MakeUnique<OffscreenCanvasCompositorFrameSink>(
           this, frame_sink_id, std::move(request), std::move(client));
 
-  OffscreenCanvasSurfaceManager::GetInstance()->RegisterFrameSinkToParent(
-      frame_sink_id);
+  OffscreenCanvasCompositorFrameSinkManager::GetInstance()
+      ->RegisterFrameSinkToParent(frame_sink_id);
 }
 
 cc::SurfaceManager*
@@ -50,8 +50,8 @@ void OffscreenCanvasCompositorFrameSinkProviderImpl::
 
 void OffscreenCanvasCompositorFrameSinkProviderImpl::
     OnCompositorFrameSinkClientDestroyed(const cc::FrameSinkId& frame_sink_id) {
-  OffscreenCanvasSurfaceManager::GetInstance()->UnregisterFrameSinkFromParent(
-      frame_sink_id);
+  OffscreenCanvasCompositorFrameSinkManager::GetInstance()
+      ->UnregisterFrameSinkFromParent(frame_sink_id);
 }
 
 }  // namespace content