Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 47642dd4993fdb7cec4f3460ea0fa9eddd84c087..5458c0e399ca5a06c9cf63ec12258a488b66ada3 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -22,7 +22,6 @@
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/test/pixel_test_output_surface.h"
-#include "cc/test/test_shared_bitmap_manager.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -191,7 +190,7 @@ void InProcessContextFactory::CreateCompositorFrameSink(
       begin_frame_source.get(), compositor->task_runner().get(),
       display_output_surface->capabilities().max_frames_pending));
   per_compositor_data_[compositor.get()] = base::MakeUnique<cc::Display>(
-      GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
+      &shared_bitmap_manager_, &gpu_memory_buffer_manager_,
       compositor->GetRendererSettings(), std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(
@@ -200,7 +199,8 @@ void InProcessContextFactory::CreateCompositorFrameSink(
   auto* display = per_compositor_data_[compositor.get()].get();
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
       compositor->frame_sink_id(), surface_manager_, display, context_provider,
-      shared_worker_context_provider_);
+      shared_worker_context_provider_, &gpu_memory_buffer_manager_,
+      &shared_bitmap_manager_);
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
@@ -245,10 +245,6 @@ uint32_t InProcessContextFactory::GetImageTextureTarget(
   return GL_TEXTURE_2D;
 }
 
-cc::SharedBitmapManager* InProcessContextFactory::GetSharedBitmapManager() {
-  return &shared_bitmap_manager_;
-}
-
 gpu::GpuMemoryBufferManager*
 InProcessContextFactory::GetGpuMemoryBufferManager() {
   return &gpu_memory_buffer_manager_;