Consolidate OutputSurface constructors into GL vs Vulkan.

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 9250ee44cc1bb9b5c026fd13c80d79a1ba8bcee5..96ab60d1a2709a8fd4e0ad3acdf125bba6e107b9 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -4,6 +4,8 @@
 
 #include "cc/test/pixel_test_output_surface.h"
 
+#include <utility>
+
 #include "cc/output/output_surface_client.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "ui/gfx/transform.h"
@@ -15,7 +17,9 @@ PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_refptr<ContextProvider> worker_context_provider,
     bool flipped_output_surface,
     std::unique_ptr<BeginFrameSource> begin_frame_source)
-    : OutputSurface(context_provider, worker_context_provider),
+    : OutputSurface(std::move(context_provider),
+                    std::move(worker_context_provider),
+                    nullptr),
       begin_frame_source_(std::move(begin_frame_source)),
       external_stencil_test_(false) {
   capabilities_.adjust_deadline_for_parent = false;
@@ -26,7 +30,7 @@ PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
     bool flipped_output_surface,
     std::unique_ptr<BeginFrameSource> begin_frame_source)
-    : PixelTestOutputSurface(context_provider,
+    : PixelTestOutputSurface(std::move(context_provider),
                              nullptr,
                              flipped_output_surface,
                              std::move(begin_frame_source)) {}
@@ -34,7 +38,7 @@ PixelTestOutputSurface::PixelTestOutputSurface(
 PixelTestOutputSurface::PixelTestOutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device,
     std::unique_ptr<BeginFrameSource> begin_frame_source)
-    : OutputSurface(std::move(software_device)),
+    : OutputSurface(nullptr, nullptr, std::move(software_device)),
       begin_frame_source_(std::move(begin_frame_source)),
       external_stencil_test_(false) {}