Consolidate OutputSurface constructors into GL vs Vulkan.

components/mus/surfaces/direct_output_surface_ozone.h

Index: components/mus/surfaces/direct_output_surface_ozone.h
diff --git a/components/mus/surfaces/direct_output_surface_ozone.h b/components/mus/surfaces/direct_output_surface_ozone.h
index ad0904efdb8c50339354437017f6f96808f191a5..f47725aa0194833840a91d1cd5641264296fe8c2 100644
--- a/components/mus/surfaces/direct_output_surface_ozone.h
+++ b/components/mus/surfaces/direct_output_surface_ozone.h
@@ -41,7 +41,7 @@ class SurfacesContextProvider;
 class DirectOutputSurfaceOzone : public cc::OutputSurface {
  public:
   DirectOutputSurfaceOzone(
-      const scoped_refptr<SurfacesContextProvider>& context_provider,
+      scoped_refptr<SurfacesContextProvider> context_provider,
       gfx::AcceleratedWidget widget,
       base::SingleThreadTaskRunner* task_runner,
       uint32_t target,
@@ -69,7 +69,7 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
 
   display_compositor::GLHelper gl_helper_;
   OzoneGpuMemoryBufferManager gpu_memory_buffer_manager_;
-  std::unique_ptr<display_compositor::BufferQueue> output_surface_;
+  std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
   std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
 
   base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;