Move frame_sink_id management to framesink_manager.cc/h from

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index fd3a6261e3cf5b938bf50805887de79c2eef44c0..c01e2c39774aad04d44bae7dc2b6b3fae218a80f 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -339,7 +339,7 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
       compositor_frame_sink_request_pending_(false),
       weak_factory_(this) {
   ui::ContextProviderFactory::GetInstance()
-      ->GetSurfaceManager()
+      ->GetFrameSinkManager()
       ->RegisterFrameSinkId(frame_sink_id_);
   DCHECK(client);
   DCHECK(root_window);
@@ -359,7 +359,7 @@ CompositorImpl::~CompositorImpl() {
   // Clean-up any surface references.
   SetSurface(NULL);
   ui::ContextProviderFactory::GetInstance()
-      ->GetSurfaceManager()
+      ->GetFrameSinkManager()
       ->InvalidateFrameSinkId(frame_sink_id_);
 }
 
@@ -650,6 +650,8 @@ void CompositorImpl::InitializeDisplay(
 
   cc::SurfaceManager* manager =
       ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
+  cc::FrameSinkManager* framesink_manager =
+      ui::ContextProviderFactory::GetInstance()->GetFrameSinkManager();
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       task_runner, display_output_surface->capabilities().max_frames_pending));
@@ -665,11 +667,12 @@ void CompositorImpl::InitializeDisplay(
   auto compositor_frame_sink =
       vulkan_context_provider
           ? base::MakeUnique<cc::DirectCompositorFrameSink>(
-                frame_sink_id_, manager, display_.get(),
+                frame_sink_id_, manager, framesink_manager, display_.get(),
                 vulkan_context_provider)
           : base::MakeUnique<cc::DirectCompositorFrameSink>(
-                frame_sink_id_, manager, display_.get(), context_provider,
-                nullptr, BrowserGpuMemoryBufferManager::current(),
+                frame_sink_id_, manager, framesink_manager, display_.get(),
+                context_provider, nullptr,
+                BrowserGpuMemoryBufferManager::current(),
                 HostSharedBitmapManager::current());
 
   display_->SetVisible(true);