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

content/browser/android/browser_surface_texture_manager.h

Index: content/browser/android/browser_surface_texture_manager.h
diff --git a/content/browser/android/browser_surface_texture_manager.h b/content/browser/android/browser_surface_texture_manager.h
index 639ce28b0e5721ceb22286d7ab155602ff53f13e..4529c9ce8c7dce59eb7b83ceacc9ad7bf2142238 100644
--- a/content/browser/android/browser_surface_texture_manager.h
+++ b/content/browser/android/browser_surface_texture_manager.h
@@ -5,18 +5,15 @@
 #ifndef CONTENT_BROWSER_ANDROID_BROWSER_SURFACE_TEXTURE_MANAGER_H_
 #define CONTENT_BROWSER_ANDROID_BROWSER_SURFACE_TEXTURE_MANAGER_H_
 
-#include "gpu/ipc/common/android/surface_texture_manager.h"
-
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "content/common/content_export.h"
-#include "gpu/ipc/common/android/surface_texture_peer.h"
+#include "gpu/ipc/common/android/surface_texture_manager.h"
 
 namespace content {
 
 class CONTENT_EXPORT BrowserSurfaceTextureManager
-    : public gpu::SurfaceTextureManager,
-      public gpu::SurfaceTexturePeer {
+    : public gpu::SurfaceTextureManager {
  public:
   static BrowserSurfaceTextureManager* GetInstance();
 
@@ -28,13 +25,6 @@ class CONTENT_EXPORT BrowserSurfaceTextureManager
   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<BrowserSurfaceTextureManager>;