Consolidate OutputSurface constructors into GL vs Vulkan.

cc/test/fake_output_surface.h

Index: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 0374a7d447dd82a752603582338e9ecba0b5fa23..a08bf454b2b78c49f16c3714ba332e9109798e5e 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -60,7 +60,7 @@ class FakeOutputSurface : public OutputSurface {
   static std::unique_ptr<FakeOutputSurface>
   Create3dWithResourcelessSoftwareSupport() {
     return base::WrapUnique(new FakeOutputSurface(
-        TestContextProvider::Create(),
+        TestContextProvider::Create(), TestContextProvider::CreateWorker(),
         base::WrapUnique(new SoftwareOutputDevice), false));
   }
 
@@ -98,8 +98,9 @@ class FakeOutputSurface : public OutputSurface {
 
   static std::unique_ptr<FakeOutputSurface> CreateOffscreen(
       std::unique_ptr<TestWebGraphicsContext3D> context) {
-    std::unique_ptr<FakeOutputSurface> surface(new FakeOutputSurface(
-        TestContextProvider::Create(std::move(context)), false));
+    std::unique_ptr<FakeOutputSurface> surface(
+        new FakeOutputSurface(TestContextProvider::Create(std::move(context)),
+                              TestContextProvider::CreateWorker(), false));
     surface->capabilities_.uses_default_gl_framebuffer = false;
     return surface;
   }
@@ -152,10 +153,6 @@ class FakeOutputSurface : public OutputSurface {
   }
 
  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);
@@ -164,6 +161,7 @@ class FakeOutputSurface : public OutputSurface {
                     bool delegated_rendering);
 
   FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
+                    scoped_refptr<ContextProvider> worker_context_provider,
                     std::unique_ptr<SoftwareOutputDevice> software_device,
                     bool delegated_rendering);