gpu: Move image creation part of GpuMemoryBufferFactory interface to gpu namespace.

content/common/gpu/gpu_memory_buffer_factory_android.cc

Index: content/common/gpu/gpu_memory_buffer_factory_android.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_android.cc b/content/common/gpu/gpu_memory_buffer_factory_android.cc
index 9730ffbe851bef1c6eb7ac94d5ce607785c1f00a..4c9226364bd66ce85d07cbb61ef1a882e3c5a1e9 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_android.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_android.cc
@@ -6,13 +6,15 @@
 
 #include "base/logging.h"
 #include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"
+#include "gpu/command_buffer/service/image_factory.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_image_shared_memory.h"
 
 namespace content {
 namespace {
 
-class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
+class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory,
+                                   public gpu::ImageFactory {
  public:
   // Overridden from GpuMemoryBufferFactory:
   virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
@@ -40,6 +42,9 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
         break;
     }
   }
+  virtual gpu::ImageFactory* AsImageFactory() override { return this; }
+
+  // Overridden from gpu::ImageFactory:
   virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,