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

gpu/ipc/service/gpu_memory_buffer_factory.h

Index: gpu/ipc/service/gpu_memory_buffer_factory.h
diff --git a/gpu/ipc/service/gpu_memory_buffer_factory.h b/gpu/ipc/service/gpu_memory_buffer_factory.h
deleted file mode 100644
index beb278cb3725973380e4661bdc8a5cbd7cb871a8..0000000000000000000000000000000000000000
--- a/gpu/ipc/service/gpu_memory_buffer_factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_
-#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_
-
-#include <vector>
-
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "gpu/gpu_export.h"
-#include "gpu/ipc/common/surface_handle.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/gpu_memory_buffer.h"
-
-namespace gpu {
-
-class ImageFactory;
-
-class GPU_EXPORT GpuMemoryBufferFactory {
- public:
-  virtual ~GpuMemoryBufferFactory() {}
-
-  // Creates a new factory instance for native GPU memory buffers.
-  static scoped_ptr<GpuMemoryBufferFactory> CreateNativeType();
-
-  // Creates a new GPU memory buffer instance. A valid handle is returned on
-  // success. It can be called on any thread.
-  virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      gfx::BufferUsage usage,
-      int client_id,
-      SurfaceHandle surface_handle) = 0;
-
-  // Creates a new GPU memory buffer instance from an existing handle. A valid
-  // handle is returned on success. It can be called on any thread.
-  virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromHandle(
-      const gfx::GpuMemoryBufferHandle& handle,
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      int client_id) = 0;
-
-  // Destroys GPU memory buffer identified by |id|.
-  // It can be called on any thread.
-  virtual void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
-                                      int client_id) = 0;
-
-  // Type-checking downcast routine.
-  virtual ImageFactory* AsImageFactory() = 0;
-
- protected:
-  GpuMemoryBufferFactory() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactory);
-};
-
-}  // namespace gpu
-
-#endif  // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_H_