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

content/test/content_test_suite.cc

 // Copyright (c) 2012 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.
 
 #include "content/test/content_test_suite.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #if defined(OS_WIN)
 #include "ui/display/win/dpi.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/test/mock_chrome_application_mac.h"
 #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
 
 namespace content {
 namespace {
 
 class TestInitializationListener : public testing::EmptyTestEventListener {
  public:
   TestInitializationListener() : test_content_client_initializer_(NULL) {
   }
 
@@ skipping 47 matching lines @@
     gpu::CollectBasicGraphicsInfo(&gpu_info);
     gpu::ApplyGpuDriverBugWorkarounds(gpu_info,
                                       base::CommandLine::ForCurrentProcess());
     gfx::GLSurfaceTestSupport::InitializeOneOff();
   }
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   gpu::SurfaceTextureManager::SetInstance(
-      InProcessSurfaceTextureManager::GetInstance());
+      gpu::InProcessSurfaceTextureManager::GetInstance());
+  content::BrowserMediaPlayerManager::InitSurfaceTexturePeer();
 #endif
 }
 
 }  // namespace content