Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index fb263acdca0ba68e58b82a635c16c5de21e2cd10..04f5762c28fc639ae2a4295060656bffec53def2 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1139,7 +1139,6 @@
   explicit NonReshapableOutputSurface(
       std::unique_ptr<TestWebGraphicsContext3D> context3d)
       : FakeOutputSurface(TestContextProvider::Create(std::move(context3d)),
-                          nullptr,
                           false) {
     surface_size_ = gfx::Size(500, 500);
   }
@@ -1762,11 +1761,9 @@
 class MockOutputSurface : public OutputSurface {
  public:
   MockOutputSurface()
-      : OutputSurface(
-            TestContextProvider::Create(
-                base::MakeUnique<StrictMock<OutputSurfaceMockContext>>()),
-            nullptr,
-            nullptr) {
+      : OutputSurface(TestContextProvider::Create(
+            std::unique_ptr<TestWebGraphicsContext3D>(
+                new StrictMock<OutputSurfaceMockContext>))) {
     surface_size_ = gfx::Size(100, 100);
   }
   virtual ~MockOutputSurface() {}