gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h

Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
index d868e5183bdfa5ca1dee5d3d4e3160d752535416..2da30b4e3fcdd130b0a370ee7092b3209ceb3c63 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
@@ -12,12 +12,14 @@ namespace content {
 // Implementation of GPU memory buffer based on Ozone native buffers.
 class GpuMemoryBufferImplOzoneNativeBuffer : 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);
@@ -28,7 +30,8 @@ class GpuMemoryBufferImplOzoneNativeBuffer : 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);
@@ -42,14 +45,12 @@ class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl {
   gfx::GpuMemoryBufferHandle GetHandle() const override;
 
  private:
-  GpuMemoryBufferImplOzoneNativeBuffer(const gfx::Size& size,
+  GpuMemoryBufferImplOzoneNativeBuffer(gfx::GpuMemoryBufferId id,
+                                       const gfx::Size& size,
                                        Format format,
-                                       const DestructionCallback& callback,
-                                       const gfx::GpuMemoryBufferId& id);
+                                       const DestructionCallback& callback);
   ~GpuMemoryBufferImplOzoneNativeBuffer() override;
 
-  gfx::GpuMemoryBufferId id_;
-
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplOzoneNativeBuffer);
 };