Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

cc/surfaces/direct_compositor_frame_sink_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/direct_compositor_frame_sink.h"
 
 #include <memory>
 
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 39 matching lines @@
     std::unique_ptr<DisplayScheduler> scheduler(new DisplayScheduler(
         begin_frame_source.get(), task_runner_.get(), max_frames_pending));
 
     display_.reset(new Display(
         &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(),
         std::move(begin_frame_source), std::move(display_output_surface),
         std::move(scheduler),
         base::MakeUnique<TextureMailboxDeleter>(task_runner_.get())));
     compositor_frame_sink_.reset(new DirectCompositorFrameSink(
         kArbitraryFrameSinkId, &surface_manager_, display_.get(),
-        context_provider_, nullptr));
+        context_provider_, nullptr, &gpu_memory_buffer_manager_,
+        &bitmap_manager_));
 
     compositor_frame_sink_->BindToClient(&compositor_frame_sink_client_);
     display_->Resize(display_size_);
     display_->SetVisible(true);
 
     EXPECT_FALSE(
         compositor_frame_sink_client_.did_lose_compositor_frame_sink_called());
   }
 
   ~DirectCompositorFrameSinkTest() override {
@@ skipping 77 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc