Refactor content/common/gpu into gpu/ipc/service

gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h

Index: gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h b/gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
similarity index 77%
rename from content/common/gpu/gpu_memory_buffer_factory_io_surface.h
rename to gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
index 75e6b396a8bd15dcf36189f296d13f4cc4526f2f..cccc126e882b806694564b2dfb10cdafdddf6cb1 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
-#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
+#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
 
 #include <utility>
 
@@ -14,9 +14,9 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/service/image_factory.h"
+#include "gpu/gpu_export.h"
+#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/mac/io_surface.h"
@@ -25,11 +25,11 @@ namespace gl {
 class GLImage;
 }
 
-namespace content {
+namespace gpu {
 
-class CONTENT_EXPORT GpuMemoryBufferFactoryIOSurface
+class GPU_EXPORT GpuMemoryBufferFactoryIOSurface
     : public GpuMemoryBufferFactory,
-      public gpu::ImageFactory {
+      public ImageFactory {
  public:
   GpuMemoryBufferFactoryIOSurface();
   ~GpuMemoryBufferFactoryIOSurface() override;
@@ -41,7 +41,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryIOSurface
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int client_id,
-      gpu::SurfaceHandle surface_handle) override;
+      SurfaceHandle surface_handle) override;
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromHandle(
       const gfx::GpuMemoryBufferHandle& handle,
       gfx::GpuMemoryBufferId id,
@@ -50,9 +50,9 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryIOSurface
       int client_id) override;
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id) override;
-  gpu::ImageFactory* AsImageFactory() override;
+  ImageFactory* AsImageFactory() override;
 
-  // Overridden from gpu::ImageFactory:
+  // Overridden from ImageFactory:
   scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
@@ -72,6 +72,6 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryIOSurface
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryIOSurface);
 };
 
-}  // namespace content
+}  // namespace gpu
 
-#endif  // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
+#endif  // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_