content: Make sure all CreateGpuMemoryBuffer messages are handled.

content/common/gpu/gpu_channel_manager.h

Index: content/common/gpu/gpu_channel_manager.h
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 05092402d1fba0eb7e00fcdd9544444c2295a769..733081b4b45e4d555bd60e8fa5665d09b8372211 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -29,7 +29,6 @@ class WaitableEvent;
 
 namespace gfx {
 class GLShareGroup;
-struct GpuMemoryBufferHandle;
 }
 
 namespace gpu {
@@ -46,7 +45,6 @@ namespace IPC {
 class AttachmentBroker;
 struct ChannelHandle;
 class SyncChannel;
-class MessageFilter;
 }
 
 struct GPUCreateCommandBufferConfig;
@@ -69,7 +67,8 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
                     base::SingleThreadTaskRunner* io_task_runner,
                     base::WaitableEvent* shutdown_event,
                     IPC::SyncChannel* channel,
-                    IPC::AttachmentBroker* broker);
+                    IPC::AttachmentBroker* broker,
+                    GpuMemoryBufferFactory* gpu_memory_buffer_factory);
   ~GpuChannelManager() override;
 
   // Remove the channel for a particular renderer.
@@ -104,7 +103,7 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   gfx::GLSurface* GetDefaultOffscreenSurface();
 
   GpuMemoryBufferFactory* gpu_memory_buffer_factory() {
-    return gpu_memory_buffer_factory_.get();
+    return gpu_memory_buffer_factory_;
   }
 
  private:
@@ -158,9 +157,8 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;
-  scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
+  GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
   IPC::SyncChannel* channel_;
-  scoped_refptr<IPC::MessageFilter> filter_;
   bool relinquish_resources_pending_;
   // Must outlive this instance of GpuChannelManager.
   IPC::AttachmentBroker* attachment_broker_;