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

gpu/command_buffer/tests/gl_manager.h

Index: gpu/command_buffer/tests/gl_manager.h
diff --git a/gpu/command_buffer/tests/gl_manager.h b/gpu/command_buffer/tests/gl_manager.h
index 60187bd8584a7a9a3a5f00f2dd223a20f36e0f39..d6d367b5c9df5f0ff7e23ef67cea0a2105aa60fa 100644
--- a/gpu/command_buffer/tests/gl_manager.h
+++ b/gpu/command_buffer/tests/gl_manager.h
@@ -24,7 +24,6 @@ namespace gpu {
 
 class CommandBufferService;
 class GpuControlService;
-class GpuMemoryBufferFactory;
 class GpuScheduler;
 class TransferBuffer;
 
@@ -35,7 +34,6 @@ class MailboxManager;
 class GLES2Decoder;
 class GLES2CmdHelper;
 class GLES2Implementation;
-class ImageFactory;
 class ImageManager;
 class ShareGroup;
 
@@ -59,10 +57,6 @@ class GLManager : private GpuControl {
     bool lose_context_when_out_of_memory;
     // Whether or not it's ok to lose the context.
     bool context_lost_allowed;
-    // Image manager to be used.
-    gles2::ImageManager* image_manager;
-    // GpuMemoryBuffer factory to be used.
-    GpuMemoryBufferFactory* gpu_memory_buffer_factory;
   };
   GLManager();
   virtual ~GLManager();
@@ -132,8 +126,7 @@ class GLManager : private GpuControl {
   bool context_lost_allowed_;
 
   // Client GpuControl implementation.
-  GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
-  base::ScopedPtrHashMap<int32, gfx::GpuMemoryBuffer> memory_buffers_;
+  base::ScopedPtrHashMap<int32, gfx::GpuMemoryBuffer> gpu_memory_buffers_;
 
   // Used on Android to virtualize GL for all contexts.
   static int use_count_;