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

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

Issue 134003003: Revert of video: On ChromeOS don't assume GLX always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « chrome/browser/media/chrome_webrtc_browsertest.cc ('k') | content/browser/media/webrtc_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/webrtc_aecdump_browsertest.cc
diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc
index cf98c4bad86924a61a35b52a28fca81fd865303f..f65b1a427869ac809f337a403c17f3e86fbec81c 100644
--- a/content/browser/media/webrtc_aecdump_browsertest.cc
+++ b/content/browser/media/webrtc_aecdump_browsertest.cc
@@ -27,9 +27,6 @@
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ASSERT_TRUE(CreateTemporaryFileInDir(temp_dir_.path(), &dump_file_));
- // These tests expect pixel output.
- UseRealGLContexts();
-
ContentBrowserTest::SetUp();
}
@@ -40,6 +37,10 @@
switches::kUseFakeDeviceForMediaStream));
ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
switches::kUseFakeUIForMediaStream));
+
+ // The video playback will not work without a GPU, so force its use here.
+ // This may not be available on all VMs though.
+ command_line->AppendSwitch(switches::kUseGpuInTests);
// Enable AEC dump with the command line flag.
command_line->AppendSwitchPath(switches::kEnableWebRtcAecRecordings,
« no previous file with comments | « chrome/browser/media/chrome_webrtc_browsertest.cc ('k') | content/browser/media/webrtc_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698