mus: Use BufferQueue and GLHelper from display_compositor.

components/mus/surfaces/direct_output_surface_ozone.cc

Index: components/mus/surfaces/direct_output_surface_ozone.cc
diff --git a/components/mus/surfaces/direct_output_surface_ozone.cc b/components/mus/surfaces/direct_output_surface_ozone.cc
index 74eebc1f675c24b8cb3c68c40a20d60eb4fd6f1e..deb675f9edb192da4789d70ef9ccb4bd44b0075c 100644
--- a/components/mus/surfaces/direct_output_surface_ozone.cc
+++ b/components/mus/surfaces/direct_output_surface_ozone.cc
@@ -10,12 +10,14 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
+#include "components/display_compositor/buffer_queue.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
-#include "components/mus/surfaces/buffer_queue.h"
 #include "components/mus/surfaces/surfaces_context_provider.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
+using display_compositor::BufferQueue;
+
 namespace mus {
 
 DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
@@ -25,8 +27,14 @@ DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
     uint32_t target,
     uint32_t internalformat)
     : cc::OutputSurface(context_provider),
-      output_surface_(
-          new BufferQueue(context_provider, target, internalformat, widget)),
+      gl_helper_(context_provider->ContextGL(),
+                 context_provider->ContextSupport()),
+      output_surface_(new BufferQueue(context_provider,
+                                      target,
+                                      internalformat,
+                                      &gl_helper_,
+                                      &gpu_memory_buffer_manager_,
+                                      widget)),
       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),