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

gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h

Index: gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h
diff --git a/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h b/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h
deleted file mode 100644
index 4c7544bb98f8f8b5c7056fb8b55360fcb5116499..0000000000000000000000000000000000000000
--- a/gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h
+++ /dev/null
@@ -1,72 +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_SURFACE_TEXTURE_H_
-#define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_
-
-#include <utility>
-
-#include "base/containers/hash_tables.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"
-
-namespace gfx {
-class SurfaceTexture;
-}
-
-namespace gl {
-class GLImage;
-}
-
-namespace gpu {
-
-class GPU_EXPORT GpuMemoryBufferFactorySurfaceTexture
-    : public GpuMemoryBufferFactory,
-      public ImageFactory {
- public:
-  GpuMemoryBufferFactorySurfaceTexture();
-  ~GpuMemoryBufferFactorySurfaceTexture() 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<int, int> SurfaceTextureMapKey;
-  typedef base::hash_map<SurfaceTextureMapKey,
-                         scoped_refptr<gfx::SurfaceTexture>> SurfaceTextureMap;
-  SurfaceTextureMap surface_textures_;
-  base::Lock surface_textures_lock_;
-};
-
-}  // namespace gpu
-
-#endif  // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_