Consolidate OutputSurface constructors into GL vs Vulkan.

cc/test/fake_output_surface.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/fake_output_surface.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 FakeOutputSurface::FakeOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     bool delegated_rendering)
-    : OutputSurface(context_provider, worker_context_provider),
+    : OutputSurface(context_provider, worker_context_provider, nullptr),
       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)
-    : OutputSurface(std::move(software_device)),
+    : OutputSurface(nullptr, nullptr, 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(

[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),
       suspended_for_recycle_(false),
       framebuffer_(0),
       overlay_candidate_validator_(nullptr) {
   capabilities_.delegated_rendering = delegated_rendering;
 }
 
 FakeOutputSurface::~FakeOutputSurface() {}
@@ skipping 71 matching lines @@
     const {
   return overlay_candidate_validator_;
 }
 
 void FakeOutputSurface::SetMemoryPolicyToSetAtBind(
     std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind) {
   memory_policy_to_set_at_bind_.swap(memory_policy_to_set_at_bind);
 }
 
 }  // namespace cc