Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/gpu/mailbox_output_surface.cc

Index: content/renderer/gpu/mailbox_output_surface.cc
diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc
index 4d90944759b1679fcbb90c3def67456d515fad26..065e2a4f81c499051d8d797ec206860a87f8bda8 100644
--- a/content/renderer/gpu/mailbox_output_surface.cc
+++ b/content/renderer/gpu/mailbox_output_surface.cc
@@ -25,21 +25,16 @@ namespace content {
 MailboxOutputSurface::MailboxOutputSurface(
     int32_t routing_id,
     uint32_t output_surface_id,
-    const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
-    const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
-    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
-    cc::ResourceFormat format)
+    scoped_refptr<cc::ContextProvider> context_provider,
+    scoped_refptr<cc::ContextProvider> worker_context_provider,
+    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
     : CompositorOutputSurface(routing_id,
                               output_surface_id,
-                              context_provider,
-                              worker_context_provider,
-                              nullptr,
-                              nullptr,
-                              swap_frame_message_queue,
-                              true),
+                              std::move(context_provider),
+                              std::move(worker_context_provider),
+                              std::move(swap_frame_message_queue)),
       fbo_(0),
-      is_backbuffer_discarded_(false),
-      format_(format) {
+      is_backbuffer_discarded_(false) {
   pending_textures_.push_back(TransferableFrame());
   capabilities_.uses_default_gl_framebuffer = false;
 }
@@ -87,14 +82,9 @@ void MailboxOutputSurface::EnsureBackbuffer() {
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-      gl->TexImage2D(GL_TEXTURE_2D,
-                     0,
-                     GLInternalFormat(format_),
-                     surface_size_.width(),
-                     surface_size_.height(),
-                     0,
-                     GLDataFormat(format_),
-                     GLDataType(format_),
+      gl->TexImage2D(GL_TEXTURE_2D, 0, GLInternalFormat(cc::RGBA_8888),
+                     surface_size_.width(), surface_size_.height(), 0,
+                     GLDataFormat(cc::RGBA_8888), GLDataType(cc::RGBA_8888),
                      NULL);
       gl->GenMailboxCHROMIUM(current_backing_.mailbox.name);
       gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, current_backing_.mailbox.name);