Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 71a1dcc40f251bff02e9a0b2fd85eb43bfd0a89c..4b80fd590878d7ac6b541840b7a21107aa321db4 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -514,8 +514,8 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
           display_output_surface =
               base::MakeUnique<MusBrowserCompositorOutputSurface>(
                   compositor->window(), context_provider,
-                  compositor->vsync_manager(), begin_frame_source.get(),
-                  std::move(validator));
+                  GetGpuMemoryBufferManager(), compositor->vsync_manager(),
+                  begin_frame_source.get(), std::move(validator));
 #else
           NOTREACHED();
 #endif
@@ -560,7 +560,8 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
           : base::MakeUnique<cc::DirectCompositorFrameSink>(
                 compositor->frame_sink_id(), surface_manager_.get(),
                 data->display.get(), context_provider,
-                shared_worker_context_provider_);
+                shared_worker_context_provider_, GetGpuMemoryBufferManager(),
+                HostSharedBitmapManager::current());
   data->display->Resize(compositor->size());
   data->display->SetOutputIsSecure(data->output_is_secure);
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
@@ -633,10 +634,6 @@ uint32_t GpuProcessTransportFactory::GetImageTextureTarget(
   return BrowserGpuMemoryBufferManager::GetImageTextureTarget(format, usage);
 }
 
-cc::SharedBitmapManager* GpuProcessTransportFactory::GetSharedBitmapManager() {
-  return HostSharedBitmapManager::current();
-}
-
 gpu::GpuMemoryBufferManager*
 GpuProcessTransportFactory::GetGpuMemoryBufferManager() {
   return gpu_channel_factory_->GetGpuMemoryBufferManager();