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 {

[piman, 2016/04/14 01:31:04]

This change and many others in this CL seems unrelated to the topic (moving
unittests). Are they intended?

[Peng, 2016/04/14 15:06:51]

Some unittests on Android platform will crash, if the
BrowserSurfaceTextureManager is not initialized. So to move those unittests to
GPU folder, we have to move BrowserSurfaceTextureManager out of content too.
That why it move this file here.

And this class implements the gpu::SurfaceTexturePeer. The overrided function
EstablishSurfaceTexturePeer() depends on some media player related code in
content. And the media player code has huge dependencies. It is hard to move
them all out of content. I create a new class BrowserSurfaceTexturePeer for that
function and leave it in the content.

+    : 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>;