Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/test/layouttest_support.cc

Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index df166e20fcd1eef1e05bad656185ae75161da40d..9051eae99019659ca7bad6e99a39028e8f551f40 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -329,6 +329,7 @@ class LayoutTestDependenciesImpl : public LayoutTestDependencies,
       scoped_refptr<gpu::GpuChannelHost> gpu_channel,
       scoped_refptr<cc::ContextProvider> compositor_context_provider,
       scoped_refptr<cc::ContextProvider> worker_context_provider,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       CompositorDependencies* deps) override {
     // This could override the GpuChannel for a CompositorFrameSink that was
     // previously being created but in that case the old GpuChannel would be
@@ -346,10 +347,9 @@ class LayoutTestDependenciesImpl : public LayoutTestDependencies,
 
     auto compositor_frame_sink = base::MakeUnique<cc::TestCompositorFrameSink>(
         std::move(compositor_context_provider),
-        std::move(worker_context_provider), deps->GetSharedBitmapManager(),
-        deps->GetGpuMemoryBufferManager(), settings.renderer_settings,
-        task_runner, synchronous_composite,
-        false /* force_disable_reclaim_resources */);
+        std::move(worker_context_provider), nullptr /* shared_bitmap_manager */,
+        gpu_memory_buffer_manager, settings.renderer_settings, task_runner,
+        synchronous_composite, false /* force_disable_reclaim_resources */);
     compositor_frame_sink->SetClient(this);
     compositor_frame_sinks_[routing_id] = compositor_frame_sink.get();
     return std::move(compositor_frame_sink);