cc: Remove things from OutputSurface and 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 275 matching lines @@
     std::unique_ptr<cc::OutputSurface> display_output_surface(
         new cc::PixelTestOutputSurface(
             make_scoped_refptr(new ContextProviderCommandBuffer(
                 std::move(gpu_channel), gpu::GPU_STREAM_DEFAULT,
                 gpu::GpuStreamPriority::NORMAL, gpu::kNullSurfaceHandle,
                 GURL("chrome://gpu/"
                      "LayoutTestDependenciesImpl::CreateOutputSurface"),
                 automatic_flushes, support_locking, gpu::SharedMemoryLimits(),
                 attributes, nullptr,
                 command_buffer_metrics::OFFSCREEN_CONTEXT_FOR_TESTING)),
-            nullptr, flipped_output_surface));
+            flipped_output_surface));
 
     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);
 
@@ skipping 726 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