cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/layer_tree_pixel_test.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/test/layer_tree_pixel_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
   // Always test Webview shenanigans.
   gfx::Size surface_expansion_size(40, 60);
 
   std::unique_ptr<PixelTestOutputSurface> display_output_surface;
   if (test_type_ == PIXEL_TEST_GL) {
     bool flipped_output_surface = false;
     display_output_surface = base::MakeUnique<PixelTestOutputSurface>(
         // Pixel tests use a separate context for the Display to more closely
         // mimic texture transport from the renderer process to the Display
         // compositor.
-        make_scoped_refptr(new TestInProcessContextProvider(nullptr)), nullptr,
+        make_scoped_refptr(new TestInProcessContextProvider(nullptr)),
         flipped_output_surface);
   } else {
     std::unique_ptr<PixelTestSoftwareOutputDevice> software_output_device(
         new PixelTestSoftwareOutputDevice);
     software_output_device->set_surface_expansion_size(surface_expansion_size);
     display_output_surface = base::MakeUnique<PixelTestOutputSurface>(
         std::move(software_output_device));
   }
   display_output_surface->set_surface_expansion_size(surface_expansion_size);
   return std::move(display_output_surface);
@@ skipping 198 matching lines @@
 }
 
 void LayerTreePixelTest::Finish() {
   std::unique_ptr<gpu::GLInProcessContext> context =
       CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
   gl->Finish();
 }
 
 }  // namespace cc