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

Unified Diff: content/browser/media/media_browsertest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel Created 7 years, 4 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
Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index ce5b4350b43e9a83c015d944a07cd2d163da03de..7d7d45bbaf645c9cf0bdf22ce0ad0cdbcfeb3873 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -25,6 +25,14 @@ const char MediaBrowserTest::kEnded[] = "ENDED";
const char MediaBrowserTest::kError[] = "ERROR";
const char MediaBrowserTest::kFailed[] = "FAILED";
+void MediaBrowserTest::SetUp() {
+ if (UsingAcceleratedVideoDecode()) {
+ // The GPU Video Decoder needs real GL bindings.
+ UseRealGLBindings();
+ }
+ ContentBrowserTest::SetUp();
+}
+
void MediaBrowserTest::RunMediaTestPage(
const char* html_page, std::vector<StringPair>* query_params,
const char* expected, bool http) {
« no previous file with comments | « content/browser/media/media_browsertest.h ('k') | content/browser/renderer_host/render_widget_host_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698