content: Cleanup GpuMemoryBufferImpl destruction.

content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h

Index: content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
index 792d0997b5028b3dc7074b16898cff4071ef150b..b6b83725fa7843da3c9e751a93dacd24e6bbbae3 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
@@ -12,22 +12,21 @@ namespace content {
 // Implementation of GPU memory buffer based on shared memory.
 class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
  public:
-  GpuMemoryBufferImplSharedMemory(const gfx::Size& size,
-                                  unsigned internalformat);
-  virtual ~GpuMemoryBufferImplSharedMemory();
-
   static void Create(const gfx::Size& size,
                      unsigned internalformat,
                      unsigned usage,
                      const CreationCallback& callback);
 
-  // Allocates a shared memory backed GPU memory buffer with |size| and
-  // |internalformat| for use by |child_process|.
-  static void AllocateSharedMemoryForChildProcess(
+  static void AllocateForChildProcess(const gfx::Size& size,
+                                      unsigned internalformat,
+                                      base::ProcessHandle child_process,
+                                      const AllocationCallback& callback);
+
+  static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle(
+      const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       unsigned internalformat,
-      base::ProcessHandle child_process,
-      const AllocationCallback& callback);
+      const DestructionCallback& callback);
 
   static bool IsLayoutSupported(const gfx::Size& size, unsigned internalformat);
   static bool IsUsageSupported(unsigned usage);
@@ -35,9 +34,6 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
                                        unsigned internalformat,
                                        unsigned usage);
 
-  bool Initialize();
-  bool InitializeFromHandle(const gfx::GpuMemoryBufferHandle& handle);
-
   // Overridden from gfx::GpuMemoryBuffer:
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
@@ -45,6 +41,12 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
   virtual gfx::GpuMemoryBufferHandle GetHandle() const OVERRIDE;
 
  private:
+  GpuMemoryBufferImplSharedMemory(const gfx::Size& size,
+                                  unsigned internalformat,
+                                  const DestructionCallback& callback,
+                                  scoped_ptr<base::SharedMemory> shared_memory);
+  virtual ~GpuMemoryBufferImplSharedMemory();
+
   scoped_ptr<base::SharedMemory> shared_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplSharedMemory);