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 f1b59b4ee9a75d28b27833236c98cbff703a55ac..64dc259c5834dd4ccf372fc989b219c4b26834e3 100644
--- a/cc/test/fake_output_surface.cc
+++ b/cc/test/fake_output_surface.cc
@@ -18,20 +18,7 @@ FakeOutputSurface::FakeOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     bool 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),
+    : OutputSurface(context_provider, worker_context_provider, nullptr),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),
@@ -44,7 +31,7 @@ FakeOutputSurface::FakeOutputSurface(
 FakeOutputSurface::FakeOutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
-    : OutputSurface(std::move(software_device)),
+    : OutputSurface(nullptr, nullptr, std::move(software_device)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),
@@ -56,9 +43,12 @@ FakeOutputSurface::FakeOutputSurface(
 
 FakeOutputSurface::FakeOutputSurface(

[piman, 2016/05/23 22:23:51]

nit, if you want, you can trivially delegate the other 2 constructors to this
one.

[danakj, 2016/05/23 22:28:55]

Good plan.

     scoped_refptr<ContextProvider> context_provider,
+    scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
-    : OutputSurface(context_provider, std::move(software_device)),
+    : OutputSurface(std::move(context_provider),
+                    std::move(worker_context_provider),
+                    std::move(software_device)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),