content: Cleanup GpuMemoryBufferImpl destruction.

content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
index ca2873f82a4b08c162fbb7f596f9f5ee09681787..83ccbc6552f9adc55f5abf0f5448d899bfb71401 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone.cc
@@ -42,14 +42,13 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
     const AllocationCallback& callback) {
   if (GpuMemoryBufferImplOzoneNativeBuffer::IsConfigurationSupported(
           internalformat, usage)) {
-    GpuMemoryBufferImplOzoneNativeBuffer::
-        AllocateOzoneNativeBufferForChildProcess(
-            size, internalformat, usage, child_client_id, callback);
+    GpuMemoryBufferImplOzoneNativeBuffer::AllocateForChildProcess(
+        size, internalformat, usage, child_client_id, callback);
     return;
   }
   if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
           size, internalformat, usage)) {
-    GpuMemoryBufferImplSharedMemory::AllocateSharedMemoryForChildProcess(
+    GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
         size, internalformat, child_process, callback);
     return;
   }
@@ -68,24 +67,15 @@ void GpuMemoryBufferImpl::DeletedByChildProcess(
 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
-    unsigned internalformat) {
+    unsigned internalformat,
+    const DestructionCallback& callback) {
   switch (handle.type) {
-    case gfx::SHARED_MEMORY_BUFFER: {
-      scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
-          new GpuMemoryBufferImplSharedMemory(size, internalformat));
-      if (!buffer->InitializeFromHandle(handle))
-        return scoped_ptr<GpuMemoryBufferImpl>();
-
-      return buffer.PassAs<GpuMemoryBufferImpl>();
-    }
-    case gfx::OZONE_NATIVE_BUFFER: {
-      scoped_ptr<GpuMemoryBufferImplOzoneNativeBuffer> buffer(
-          new GpuMemoryBufferImplOzoneNativeBuffer(size, internalformat));
-      if (!buffer->InitializeFromHandle(handle))
-        return scoped_ptr<GpuMemoryBufferImpl>();
-
-      return buffer.PassAs<GpuMemoryBufferImpl>();
-    }
+    case gfx::SHARED_MEMORY_BUFFER:
+      return GpuMemoryBufferImplSharedMemory::CreateFromHandle(
+          handle, size, internalformat, callback);
+    case gfx::OZONE_NATIVE_BUFFER:
+      return GpuMemoryBufferImplOzoneNativeBuffer::CreateFromHandle(
+          handle, size, internalformat, callback);
     default:
       return scoped_ptr<GpuMemoryBufferImpl>();
   }