gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

content/common/gpu/client/gpu_memory_buffer_impl_android.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_android.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
index 5af28171f90fb8f2fce5981399ca37fdff9fd04d..ac2a30bbe13bbcbc8284e7f13ee26b3940e9d070 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
@@ -4,7 +4,7 @@
 
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
-#include "content/common/gpu/client/gpu_memory_buffer_impl_shm.h"
+#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
 
 namespace content {
@@ -14,10 +14,10 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::Create(
     const gfx::Size& size,
     unsigned internalformat,
     unsigned usage) {
-  if (GpuMemoryBufferImplShm::IsConfigurationSupported(
+  if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
           size, internalformat, usage)) {
-    scoped_ptr<GpuMemoryBufferImplShm> buffer(
-        new GpuMemoryBufferImplShm(size, internalformat));
+    scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
+        new GpuMemoryBufferImplSharedMemory(size, internalformat));
     if (!buffer->Initialize())
       return scoped_ptr<GpuMemoryBufferImpl>();
 
@@ -34,9 +34,9 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
     unsigned usage,
     base::ProcessHandle child_process,
     const AllocationCallback& callback) {
-  if (GpuMemoryBufferImplShm::IsConfigurationSupported(
+  if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
           size, internalformat, usage)) {
-    GpuMemoryBufferImplShm::AllocateSharedMemoryForChildProcess(
+    GpuMemoryBufferImplSharedMemory::AllocateSharedMemoryForChildProcess(
         size, internalformat, child_process, callback);
     return;
   }
@@ -51,8 +51,8 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
     unsigned internalformat) {
   switch (handle.type) {
     case gfx::SHARED_MEMORY_BUFFER: {
-      scoped_ptr<GpuMemoryBufferImplShm> buffer(
-          new GpuMemoryBufferImplShm(size, internalformat));
+      scoped_ptr<GpuMemoryBufferImplSharedMemory> buffer(
+          new GpuMemoryBufferImplSharedMemory(size, internalformat));
       if (!buffer->InitializeFromHandle(handle))
         return scoped_ptr<GpuMemoryBufferImpl>();