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