gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h

Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
index 8781c17d8d076ed3bef91942cdbab8001c992105..57256347ca8fff27b85e91dfb3199911ffdda924 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
@@ -14,12 +14,14 @@ namespace content {
 // Implementation of GPU memory buffer based on SurfaceTextures.
 class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
  public:
-  static void Create(const gfx::Size& size,
+  static void Create(gfx::GpuMemoryBufferId id,
+                     const gfx::Size& size,
                      Format format,
                      int client_id,
                      const CreationCallback& callback);
 
-  static void AllocateForChildProcess(const gfx::Size& size,
+  static void AllocateForChildProcess(gfx::GpuMemoryBufferId id,
+                                      const gfx::Size& size,
                                       Format format,
                                       int child_client_id,
                                       const AllocationCallback& callback);
@@ -30,7 +32,8 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
       Format format,
       const DestructionCallback& callback);
 
-  static void DeletedByChildProcess(const gfx::GpuMemoryBufferId& id,
+  static void DeletedByChildProcess(gfx::GpuMemoryBufferId id,
+                                    int child_client_id,
                                     uint32_t sync_point);
 
   static bool IsFormatSupported(Format format);
@@ -45,14 +48,13 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
   virtual uint32 GetStride() const override;
 
  private:
-  GpuMemoryBufferImplSurfaceTexture(const gfx::Size& size,
+  GpuMemoryBufferImplSurfaceTexture(gfx::GpuMemoryBufferId id,
+                                    const gfx::Size& size,
                                     Format format,
                                     const DestructionCallback& callback,
-                                    const gfx::GpuMemoryBufferId& id,
                                     ANativeWindow* native_window);
   virtual ~GpuMemoryBufferImplSurfaceTexture();
 
-  gfx::GpuMemoryBufferId id_;
   ANativeWindow* native_window_;
   size_t stride_;