Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

cc/test/fake_output_surface.cc

Index: cc/test/fake_output_surface.cc
diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc
index 23b2eda51bef30402221bf57968a70a4e7f572f5..f1b59b4ee9a75d28b27833236c98cbff703a55ac 100644
--- a/cc/test/fake_output_surface.cc
+++ b/cc/test/fake_output_surface.cc
@@ -18,27 +18,47 @@
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     bool delegated_rendering)
-    : FakeOutputSurface(std::move(context_provider),
-                        std::move(worker_context_provider),
-                        nullptr,
-                        delegated_rendering) {}
+    : OutputSurface(context_provider, worker_context_provider),
+      client_(NULL),
+      num_sent_frames_(0),
+      has_external_stencil_test_(false),
+      suspended_for_recycle_(false),
+      framebuffer_(0),
+      overlay_candidate_validator_(nullptr) {
+  capabilities_.delegated_rendering = delegated_rendering;
+}
+
+FakeOutputSurface::FakeOutputSurface(
+    scoped_refptr<ContextProvider> context_provider,
+    bool delegated_rendering)
+    : OutputSurface(context_provider),
+      client_(NULL),
+      num_sent_frames_(0),
+      has_external_stencil_test_(false),
+      suspended_for_recycle_(false),
+      framebuffer_(0),
+      overlay_candidate_validator_(nullptr) {
+  capabilities_.delegated_rendering = delegated_rendering;
+}
 
 FakeOutputSurface::FakeOutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
-    : FakeOutputSurface(nullptr,
-                        nullptr,
-                        std::move(software_device),
-                        delegated_rendering) {}
+    : OutputSurface(std::move(software_device)),
+      client_(NULL),
+      num_sent_frames_(0),
+      has_external_stencil_test_(false),
+      suspended_for_recycle_(false),
+      framebuffer_(0),
+      overlay_candidate_validator_(nullptr) {
+  capabilities_.delegated_rendering = delegated_rendering;
+}
 
 FakeOutputSurface::FakeOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
-    scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
-    : OutputSurface(std::move(context_provider),
-                    std::move(worker_context_provider),
-                    std::move(software_device)),
+    : OutputSurface(context_provider, std::move(software_device)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),