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

content/test/content_test_suite.cc

Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 663ffe63f55626df9a1e5ec7df52f84226493c5c..5bae37ba8d3784175a0e1dceda8e0b3cfec9b4c9 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -29,7 +29,8 @@
 #endif
 
 #if defined(OS_ANDROID)
-#include "content/browser/android/in_process_surface_texture_manager.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
+#include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
 #endif
 
 #if defined(USE_OZONE)
@@ -101,7 +102,8 @@ void ContentTestSuite::Initialize() {
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   gpu::SurfaceTextureManager::SetInstance(
-      InProcessSurfaceTextureManager::GetInstance());
+      gpu::InProcessSurfaceTextureManager::GetInstance());
+  content::BrowserMediaPlayerManager::InitSurfaceTexturePeer();
 #endif
 #if defined(USE_OZONE)
   if (!is_child_process) {