Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

content/test/layouttest_support.cc

 // Copyright (c) 2012 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 "content/public/test/layouttest_support.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 311 matching lines @@
 }  // namespace
 
 class LayoutTestDependenciesImpl : public LayoutTestDependencies,
                                    public cc::TestCompositorFrameSinkClient {
  public:
   std::unique_ptr<cc::CompositorFrameSink> CreateCompositorFrameSink(
       int32_t routing_id,
       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,
+      cc::SharedBitmapManager* shared_bitmap_manager,

[danakj, 2016/10/27 21:00:34]

layout tests are never software, so no need for SBM?

[piman, 2016/10/28 00:58:36]

Done.

       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
     // lost as would the CompositorFrameSink.
     gpu_channel_ = gpu_channel;
 
     auto* task_runner = deps->GetCompositorImplThreadTaskRunner().get();
     bool synchronous_composite = !task_runner;
     if (!task_runner)
       task_runner = base::ThreadTaskRunnerHandle::Get().get();
 
     cc::LayerTreeSettings settings =
         RenderWidgetCompositor::GenerateLayerTreeSettings(
             *base::CommandLine::ForCurrentProcess(), deps, 1.f);
 
     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), 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);
   }
 
   std::unique_ptr<cc::SwapPromise> RequestCopyOfOutput(
       int32_t routing_id,
       std::unique_ptr<cc::CopyOutputRequest> request) override {
     // Note that we can't immediately check compositor_frame_sinks_, since it
     // may not have been created yet. Instead, we wait until OnCommit to find
@@ skipping 760 matching lines @@
   return result;
 }
 
 void SchedulerRunIdleTasks(const base::Closure& callback) {
   blink::scheduler::RendererScheduler* scheduler =
       content::RenderThreadImpl::current()->GetRendererScheduler();
   blink::scheduler::RunIdleTasksForTesting(scheduler, callback);
 }
 
 }  // namespace content