Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/gpu/compositor_output_surface.h

Index: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index fc311698e983bb0476b22b3217fa55380ee3f6af..5e51187a584dafbeda25ba6acc27cb3554770e71 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -29,15 +29,15 @@ class Message;
 namespace cc {
 class CompositorFrame;
 class CompositorFrameAck;
+class ContextProvider;
 class GLFrameData;
 }
 
 namespace content {
-class ContextProviderCommandBuffer;
 class FrameSwapMessageQueue;
 
 // This class can be created only on the main thread, but then becomes pinned
-// to a fixed thread when bindToClient is called.
+// to a fixed thread when BindToClient is called.
 class CompositorOutputSurface
     : NON_EXPORTED_BASE(public cc::OutputSurface),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
@@ -45,13 +45,14 @@ class CompositorOutputSurface
   CompositorOutputSurface(
       int32_t routing_id,
       uint32_t output_surface_id,
-      const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
-      const scoped_refptr<ContextProviderCommandBuffer>&
-          worker_context_provider,
-      const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
-      std::unique_ptr<cc::SoftwareOutputDevice> software,
-      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
-      bool use_swap_compositor_frame_message);
+      scoped_refptr<cc::ContextProvider> context_provider,
+      scoped_refptr<cc::ContextProvider> worker_context_provider,
+      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
+  CompositorOutputSurface(
+      int32_t routing_id,
+      uint32_t output_surface_id,
+      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
+      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
   ~CompositorOutputSurface() override;
 
   // cc::OutputSurface implementation.
@@ -94,8 +95,6 @@ class CompositorOutputSurface
                                           base::TimeDelta interval);
   bool Send(IPC::Message* message);
 
-  bool use_swap_compositor_frame_message_;
-
   scoped_refptr<CompositorForwardingMessageFilter> output_surface_filter_;
   CompositorForwardingMessageFilter::Handler output_surface_filter_handler_;
   scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;