Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(713)

Unified Diff: content/test/content_test_suite.cc

Issue 1867873002: Move unittests in content/common/gpu/client to gpu/ipc/client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/gpu/generate_buildbot_json.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 3578de945c311e76ce8d831e81a66e5aa42e7736..79466229c862f248ddfb25b8e51eb622cc0b6aef 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
namespace content {
@@ -97,7 +98,8 @@ void ContentTestSuite::Initialize() {
listeners.Append(new TestInitializationListener);
#if defined(OS_ANDROID)
gpu::SurfaceTextureManager::SetInstance(
- InProcessSurfaceTextureManager::GetInstance());
+ gpu::InProcessSurfaceTextureManager::GetInstance());
+ content::BrowserMediaPlayerManager::InitSurfaceTexturePeer();
#endif
}
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/gpu/generate_buildbot_json.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698