cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/layer_tree_pixel_test.cc

Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 7461d8f3b1e02e5390d5cd15b4e61fc0f8d08212..c236c3c942aac4b9bc8a2cef32e039d31679952f 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -77,7 +77,7 @@ std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateDisplayOutputSurface(
         // 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(