Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

cc/surfaces/surface_display_output_surface.cc

Index: cc/surfaces/surface_display_output_surface.cc
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc
index d2093ac026a8de76ea6b87fbdcdff878f284b2d1..749791ef0de34c2a59c73409dbb9915b63cc437c 100644
--- a/cc/surfaces/surface_display_output_surface.cc
+++ b/cc/surfaces/surface_display_output_surface.cc
@@ -20,8 +20,7 @@
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider)
     : OutputSurface(std::move(context_provider),
-                    std::move(worker_context_provider),
-                    nullptr),
+                    std::move(worker_context_provider)),
       display_client_(nullptr),
       factory_(surface_manager, this),
       allocator_(allocator) {
@@ -38,8 +37,11 @@
     SurfaceManager* surface_manager,
     SurfaceIdAllocator* allocator,
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
-    : OutputSurface(std::move(vulkan_context_provider)),
-      display_client_(nullptr),
+    : OutputSurface(nullptr,
+                    nullptr,
+                    std::move(vulkan_context_provider),
+                    nullptr),
+      display_client_(NULL),
       factory_(surface_manager, this),
       allocator_(allocator) {
   capabilities_.delegated_rendering = true;