mus: Use BufferQueue and GLHelper from display_compositor.

components/mus/surfaces/ozone_gpu_memory_buffer_manager.h

Index: components/mus/surfaces/ozone_gpu_memory_buffer_manager.h
diff --git a/components/mus/gles2/mojo_gpu_memory_buffer_manager.h b/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h
similarity index 62%
copy from components/mus/gles2/mojo_gpu_memory_buffer_manager.h
copy to components/mus/surfaces/ozone_gpu_memory_buffer_manager.h
index 7ba37cb091630d4563a0f3521d9f7b6dfd8e2f0b..d6cf15f55fe9530a6a7e7c8f317f4031616052e3 100644
--- a/components/mus/gles2/mojo_gpu_memory_buffer_manager.h
+++ b/components/mus/surfaces/ozone_gpu_memory_buffer_manager.h
@@ -1,23 +1,21 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
-#define COMPONENTS_MUS_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
-
-#include <memory>
+#ifndef COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_
+#define COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_
 
 #include "base/macros.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 namespace mus {
 
-class MojoGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
+class OzoneGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
  public:
-  MojoGpuMemoryBufferManager();
-  ~MojoGpuMemoryBufferManager() override;
+  OzoneGpuMemoryBufferManager();
+  ~OzoneGpuMemoryBufferManager() override;
 
-  // Overridden from gpu::GpuMemoryBufferManager:
+  // gpu::GpuMemoryBufferManager:
   std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
@@ -33,9 +31,9 @@ class MojoGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
                                const gpu::SyncToken& sync_token) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MojoGpuMemoryBufferManager);
+  DISALLOW_COPY_AND_ASSIGN(OzoneGpuMemoryBufferManager);
 };
 
 }  // namespace mus
 
-#endif  // COMPONENTS_MUS_GLES2_MOJO_GPU_MEMORY_BUFFER_MANAGER_H_
+#endif  // COMPONENTS_MUS_SURFACES_DIRECT_OUTPUT_SURFACES_OZONE_H_