Remove CreateGpuMemoryBufferFromClientId and plumbing

content/browser/gpu/browser_gpu_memory_buffer_manager.h

 // Copyright 2014 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 CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 
 namespace content {
 
 using GpuMemoryBufferConfigurationKey =
     std::pair<gfx::BufferFormat, gfx::BufferUsage>;
 using GpuMemoryBufferConfigurationSet =
     base::hash_set<GpuMemoryBufferConfigurationKey>;
 
 }  // content
 
-namespace gpu {
-class GpuMemoryBufferImpl;
-}  // gpu
-
 namespace BASE_HASH_NAMESPACE {
 
 template <>
 struct hash<content::GpuMemoryBufferConfigurationKey> {
   size_t operator()(const content::GpuMemoryBufferConfigurationKey& key) const {
     return base::HashInts(static_cast<int>(key.first),
                           static_cast<int>(key.second));
   }
 };
 
@@ skipping 24 matching lines @@
   // Overridden from gpu::GpuMemoryBufferManager:
   std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle) override;
   std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format) override;
-  std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromClientId(
-      int client_id,
-      const gfx::GpuMemoryBufferId& gpu_memory_buffer_id) override;
   gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
       ClientBuffer buffer) override;
   void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
                                const gpu::SyncToken& sync_token) override;
 
   // Overridden from base::trace_event::MemoryDumpProvider:
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   void AllocateGpuMemoryBufferForChildProcess(
@@ skipping 15 matching lines @@
                                             gfx::BufferUsage usage) const;
 
  private:
   struct BufferInfo {
     BufferInfo();
     BufferInfo(const gfx::Size& size,
                gfx::GpuMemoryBufferType type,
                gfx::BufferFormat format,
                gfx::BufferUsage usage,
                int gpu_host_id);
-    BufferInfo(BufferInfo&& other);
+    BufferInfo(const BufferInfo& other);
     ~BufferInfo();
 
     gfx::Size size;
     gfx::GpuMemoryBufferType type = gfx::EMPTY_BUFFER;
     gfx::BufferFormat format = gfx::BufferFormat::RGBA_8888;
     gfx::BufferUsage usage = gfx::BufferUsage::GPU_READ;
     int gpu_host_id = 0;
-
-    // An open instance of the buffer in the browser process.
-    // TODO(ccameron): This only is implemented for IOSurface buffers. Ensure
-    // that this is always valid, and delete the then-redundant above state.
-    std::unique_ptr<gpu::GpuMemoryBufferImpl> buffer;
   };
 
   struct CreateGpuMemoryBufferRequest;
   struct CreateGpuMemoryBufferFromHandleRequest;
-  struct CreateGpuMemoryBufferFromClientIdRequest;
 
   using CreateDelegate = base::Callback<void(GpuProcessHost* host,
                                              gfx::GpuMemoryBufferId id,
                                              const gfx::Size& size,
                                              gfx::BufferFormat format,
                                              gfx::BufferUsage usage,
                                              int client_id,
                                              const CreateCallback& callback)>;
 
   std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle);
 
   // Functions that handle synchronous buffer creation requests.
   void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request);
   void HandleCreateGpuMemoryBufferFromHandleOnIO(
       CreateGpuMemoryBufferFromHandleRequest* request);
-  void HandleCreateGpuMemoryBufferFromClientIdOnIO(
-      CreateGpuMemoryBufferFromClientIdRequest* request);
   void HandleGpuMemoryBufferCreatedOnIO(
       CreateGpuMemoryBufferRequest* request,
       const gfx::GpuMemoryBufferHandle& handle);
 
   // Functions that implement asynchronous buffer creation.
   void CreateGpuMemoryBufferOnIO(const CreateDelegate& create_delegate,
                                  gfx::GpuMemoryBufferId id,
                                  const gfx::Size& size,
                                  gfx::BufferFormat format,
                                  gfx::BufferUsage usage,
@@ skipping 25 matching lines @@
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_