Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

cc/test/fake_output_surface.h

 // 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.
 
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
@@ skipping 42 matching lines @@
 
   static std::unique_ptr<FakeOutputSurface> CreateSoftware(
       std::unique_ptr<SoftwareOutputDevice> software_device) {
     return base::WrapUnique(
         new FakeOutputSurface(std::move(software_device), false));
   }
 
   static std::unique_ptr<FakeOutputSurface>
   Create3dWithResourcelessSoftwareSupport() {
     return base::WrapUnique(new FakeOutputSurface(
-        TestContextProvider::Create(), TestContextProvider::CreateWorker(),
+        TestContextProvider::Create(),
         base::WrapUnique(new SoftwareOutputDevice), false));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateDelegating3d() {
     return base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(),
                               TestContextProvider::CreateWorker(), true));
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateDelegating3d(
@@ skipping 17 matching lines @@
 
   static std::unique_ptr<FakeOutputSurface> CreateNoRequireSyncPoint(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
     std::unique_ptr<FakeOutputSurface> surface(Create3d(std::move(context)));
     surface->capabilities_.delegated_sync_points_required = false;
     return surface;
   }
 
   static std::unique_ptr<FakeOutputSurface> CreateOffscreen(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
-    std::unique_ptr<FakeOutputSurface> surface(
-        new FakeOutputSurface(TestContextProvider::Create(std::move(context)),
-                              TestContextProvider::CreateWorker(), false));
+    std::unique_ptr<FakeOutputSurface> surface(new FakeOutputSurface(
+        TestContextProvider::Create(std::move(context)), false));
     surface->capabilities_.uses_default_gl_framebuffer = false;
     return surface;
   }
 
   void set_max_frames_pending(int max) {
     capabilities_.max_frames_pending = max;
   }
 
   CompositorFrame& last_sent_frame() { return last_sent_frame_; }
   size_t num_sent_frames() { return num_sent_frames_; }
@@ skipping 32 matching lines @@
   }
 
   void SetMemoryPolicyToSetAtBind(
       std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind);
 
   gfx::Rect last_swap_rect() const {
     return last_swap_rect_;
   }
 
  protected:
+  FakeOutputSurface(
+      scoped_refptr<ContextProvider> context_provider,
+      bool delegated_rendering);
+
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_refptr<ContextProvider> worker_context_provider,
                     bool delegated_rendering);
 
   FakeOutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
-                    scoped_refptr<ContextProvider> worker_context_provider,
                     std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);
 
   OutputSurfaceClient* client_;
   CompositorFrame last_sent_frame_;
   size_t num_sent_frames_;
   bool has_external_stencil_test_;
   bool suspended_for_recycle_;
   unsigned framebuffer_;
   TransferableResourceArray resources_held_by_parent_;
   std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
   OverlayCandidateValidator* overlay_candidate_validator_;
   gfx::Rect last_swap_rect_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_OUTPUT_SURFACE_H_