Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

cc/output/compositor_frame_sink_unittest.cc

 // Copyright 2013 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/output/compositor_frame_sink.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/test/fake_compositor_frame_sink_client.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class TestCompositorFrameSink : public CompositorFrameSink {
  public:
   explicit TestCompositorFrameSink(
       scoped_refptr<TestContextProvider> context_provider,
       scoped_refptr<TestContextProvider> worker_context_provider)
       : CompositorFrameSink(std::move(context_provider),
-                            std::move(worker_context_provider)) {}
+                            std::move(worker_context_provider),
+                            nullptr,
+                            nullptr) {}
 
   void SubmitCompositorFrame(CompositorFrame frame) override {
     client_->DidReceiveCompositorFrameAck();
   }
 };
 
 TEST(CompositorFrameSinkTest, ContextLossInformsClient) {
   scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
   scoped_refptr<TestContextProvider> worker_provider =
       TestContextProvider::CreateWorker();
@@ skipping 27 matching lines @@
                                                 worker_provider);
   EXPECT_FALSE(compositor_frame_sink.HasClient());
 
   FakeCompositorFrameSinkClient client;
   EXPECT_FALSE(compositor_frame_sink.BindToClient(&client));
   EXPECT_FALSE(compositor_frame_sink.HasClient());
 }
 
 }  // namespace
 }  // namespace cc