Consolidate OutputSurface constructors into GL vs Vulkan.

components/display_compositor/buffer_queue.h

Index: components/display_compositor/buffer_queue.h
diff --git a/components/display_compositor/buffer_queue.h b/components/display_compositor/buffer_queue.h
index babbe6ecfe7666d962a6a2b807be42fc4cae82a4..f862b88534b44d730cad1a622867863bfc4bfb84 100644
--- a/components/display_compositor/buffer_queue.h
+++ b/components/display_compositor/buffer_queue.h
@@ -18,16 +18,16 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace cc {
-class ContextProvider;
-}
-
 namespace gfx {
 class GpuMemoryBuffer;
 }
 
 namespace gpu {
 class GpuMemoryBufferManager;
+
+namespace gles2 {
+class GLES2Interface;
+}
 }
 
 namespace display_compositor {
@@ -40,7 +40,7 @@ class GLHelper;
 // before the next BindFramebuffer call, otherwise it creates extra buffers.
 class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
  public:
-  BufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
+  BufferQueue(gpu::gles2::GLES2Interface* gl,
               unsigned int texture_target,
               unsigned int internalformat,
               GLHelper* gl_helper,
@@ -99,8 +99,8 @@ class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
   std::unique_ptr<AllocatedSurface> RecreateBuffer(
       std::unique_ptr<AllocatedSurface> surface);
 
+  gpu::gles2::GLES2Interface* const gl_;
   gfx::Size size_;
-  scoped_refptr<cc::ContextProvider> context_provider_;
   unsigned int fbo_;
   size_t allocated_count_;
   unsigned int texture_target_;