gpu: Refactor memory buffer handling code out of content.

services/ui/ws/gpu_service_proxy.h

Index: services/ui/ws/gpu_service_proxy.h
diff --git a/services/ui/ws/gpu_service_proxy.h b/services/ui/ws/gpu_service_proxy.h
index e5921d1709eb82b9424a9b61e0835400a8b6fb85..67dca7bf3e53f598330b082cc6bd9f2c2d1daec9 100644
--- a/services/ui/ws/gpu_service_proxy.h
+++ b/services/ui/ws/gpu_service_proxy.h
@@ -10,6 +10,7 @@
 #include "base/threading/thread.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
+#include "gpu/ipc/client/gpu_host_memory_buffer_manager.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/ui/gpu/gpu_main.h"
@@ -32,8 +33,7 @@ class MusGpuMemoryBufferManager;
 
 // The proxy implementation that relays requests from clients to the real
 // service implementation in the GPU process over mojom.GpuServiceInternal.
-class GpuServiceProxy : public mojom::GpuService,
-                        public gpu::GpuChannelHostFactory {
+class GpuServiceProxy : public gpu::GpuChannelHostFactory {
  public:
   explicit GpuServiceProxy(GpuServiceProxyDelegate* delegate);
   ~GpuServiceProxy() override;
@@ -42,26 +42,9 @@ class GpuServiceProxy : public mojom::GpuService,
 
  private:
   void OnInitialized(const gpu::GPUInfo& gpu_info);
-  void OnGpuChannelEstablished(const EstablishGpuChannelCallback& callback,
-                               int32_t client_id,
-                               mojo::ScopedMessagePipeHandle channel_handle);
   void OnInternalGpuChannelEstablished(
       mojo::ScopedMessagePipeHandle channel_handle);
 
-  // mojom::GpuService overrides:
-  void EstablishGpuChannel(
-      const EstablishGpuChannelCallback& callback) override;
-  void CreateGpuMemoryBuffer(
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      gfx::BufferUsage usage,
-      uint64_t surface_id,
-      const mojom::GpuService::CreateGpuMemoryBufferCallback& callback)
-      override;
-  void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
-                              const gpu::SyncToken& sync_token) override;
-
   // gpu::GpuChannelHostFactory overrides:
   bool IsMainThread() override;
   scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
@@ -72,12 +55,12 @@ class GpuServiceProxy : public mojom::GpuService,
   int32_t next_client_id_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   mojom::GpuServiceInternalPtr gpu_service_;
-  mojo::BindingSet<mojom::GpuService> bindings_;
   gpu::GPUInfo gpu_info_;
+  std::unique_ptr<gpu::GpuHostMemoryBufferManager> gpu_memory_buffer_manager_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
   base::WaitableEvent shutdown_event_;
   std::unique_ptr<base::Thread> io_thread_;
-  std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_;
+  //  std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_;
   GpuMain gpu_main_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy);