Move unittests in content/common/gpu/client to gpu/ipc/client

gpu/ipc/client/android/in_process_surface_texture_manager.h

 // Copyright 2015 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 CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
-#define CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
-
-#include "gpu/ipc/common/android/surface_texture_manager.h"
+#ifndef GPU_IPC_CLIENT_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
+#define GPU_IPC_CLIENT_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
 
 #include <memory>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
-#include "content/common/content_export.h"
-#include "gpu/ipc/common/android/surface_texture_peer.h"
+#include "gpu/gpu_export.h"
+#include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
-namespace content {
+namespace gpu {
 
-class CONTENT_EXPORT InProcessSurfaceTextureManager
-    : public gpu::SurfaceTextureManager,
-      public gpu::SurfaceTexturePeer {
+class GPU_EXPORT InProcessSurfaceTextureManager : public SurfaceTextureManager {
  public:
   static InProcessSurfaceTextureManager* GetInstance();
 
   // Overridden from SurfaceTextureManager:
   void RegisterSurfaceTexture(int surface_texture_id,
                               int client_id,
                               gfx::SurfaceTexture* surface_texture) override;
   void UnregisterSurfaceTexture(int surface_texture_id, int client_id) override;
   gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
       int surface_texture_id) override;
 
-  // Overridden from SurfaceTexturePeer:
-  void EstablishSurfaceTexturePeer(
-      base::ProcessHandle render_process_handle,
-      scoped_refptr<gfx::SurfaceTexture> surface_texture,
-      int render_frame_id,
-      int player_id) override;
-
  private:
   friend struct base::DefaultSingletonTraits<InProcessSurfaceTextureManager>;
 
   InProcessSurfaceTextureManager();
   ~InProcessSurfaceTextureManager() override;
 
   using SurfaceTextureMap =
       base::ScopedPtrHashMap<int, std::unique_ptr<gfx::ScopedJavaSurface>>;
   SurfaceTextureMap surface_textures_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessSurfaceTextureManager);
 };
 
-}  // namespace content
+}  // namespace gpu
 
-#endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
+#endif  // GPU_IPC_CLIENT_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_