Revert of 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/gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h b/gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
deleted file mode 100644
index cccc126e882b806694564b2dfb10cdafdddf6cb1..0000000000000000000000000000000000000000
--- a/gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h
+++ /dev/null
@@ -1,77 +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_IO_SURFACE_H_
-#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
-
-#include <utility>
-
-#include <IOSurface/IOSurface.h>
-
-#include "base/containers/hash_tables.h"
-#include "base/mac/scoped_cftyperef.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/synchronization/lock.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"
-
-namespace gl {
-class GLImage;
-}
-
-namespace gpu {
-
-class GPU_EXPORT GpuMemoryBufferFactoryIOSurface
-    : public GpuMemoryBufferFactory,
-      public ImageFactory {
- public:
-  GpuMemoryBufferFactoryIOSurface();
-  ~GpuMemoryBufferFactoryIOSurface() override;
-
-  // Overridden from GpuMemoryBufferFactory:
-  gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      gfx::BufferUsage usage,
-      int client_id,
-      SurfaceHandle surface_handle) override;
-  gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromHandle(
-      const gfx::GpuMemoryBufferHandle& handle,
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      int client_id) override;
-  void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
-                              int client_id) override;
-  ImageFactory* AsImageFactory() override;
-
-  // Overridden from ImageFactory:
-  scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
-      const gfx::GpuMemoryBufferHandle& handle,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      unsigned internalformat,
-      int client_id) override;
-
- private:
-  typedef std::pair<gfx::IOSurfaceId, int> IOSurfaceMapKey;
-  typedef base::hash_map<IOSurfaceMapKey, base::ScopedCFTypeRef<IOSurfaceRef>>
-      IOSurfaceMap;
-  // TOOD(reveman): Remove |io_surfaces_| and allow IOSurface backed GMBs to be
-  // used with any GPU process by passing a mach_port to CreateImageCHROMIUM.
-  IOSurfaceMap io_surfaces_;
-  base::Lock io_surfaces_lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryIOSurface);
-};
-
-}  // namespace gpu
-
-#endif  // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_