cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/pixel_test_output_surface.h

Index: cc/test/pixel_test_output_surface.h
diff --git a/cc/test/pixel_test_output_surface.h b/cc/test/pixel_test_output_surface.h
index 994e04ec3bd416bbb77e72fcbc65ab000e48e3d5..7964b53ed109219ef255c93e36c3309bb34de4de 100644
--- a/cc/test/pixel_test_output_surface.h
+++ b/cc/test/pixel_test_output_surface.h
@@ -13,10 +13,6 @@ class PixelTestOutputSurface : public OutputSurface {
  public:
   explicit PixelTestOutputSurface(
       scoped_refptr<ContextProvider> context_provider,
-      scoped_refptr<ContextProvider> worker_context_provider,
-      bool flipped_output_surface);
-  explicit PixelTestOutputSurface(
-      scoped_refptr<ContextProvider> context_provider,
       bool flipped_output_surface);
   explicit PixelTestOutputSurface(
       std::unique_ptr<SoftwareOutputDevice> software_device);