cc: Remove things from OutputSurface and CompositorFrameSink.

cc/test/pixel_test_output_surface.cc

Index: cc/test/pixel_test_output_surface.cc
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index 31e3041b89c5964b44e48febea5766cefc9b17da..cfdb505d2e292f6ef52daca5369e97ecb744a742 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -15,29 +15,18 @@ namespace cc {
 
 PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
     bool flipped_output_surface)
-    : OutputSurface(std::move(context_provider),
-                    std::move(worker_context_provider),
-                    nullptr),
+    : OutputSurface(std::move(context_provider)),
       external_stencil_test_(false) {
-  capabilities_.adjust_deadline_for_parent = false;
   capabilities_.flipped_output_surface = flipped_output_surface;
 }
 
 PixelTestOutputSurface::PixelTestOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
-    bool flipped_output_surface)
-    : PixelTestOutputSurface(std::move(context_provider),
-                             nullptr,
-                             flipped_output_surface) {}
-
-PixelTestOutputSurface::PixelTestOutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device)
-    : OutputSurface(nullptr, nullptr, std::move(software_device)),
+    : OutputSurface(std::move(software_device)),
       external_stencil_test_(false) {}
 
-PixelTestOutputSurface::~PixelTestOutputSurface() {}
+PixelTestOutputSurface::~PixelTestOutputSurface() = default;
 
 void PixelTestOutputSurface::Reshape(const gfx::Size& size,
                                      float scale_factor,