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

Unified Diff: chrome/browser/media/chrome_webrtc_browsertest.cc

Issue 619003003: Revert of No longer requiring pixel output for WebRTC tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/chrome_webrtc_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc
index fb5981df77163ee219c74b1779920eaadff4fc9d..ba1cfcdeca9125af9976775e6fba43e50bedc0b5 100644
--- a/chrome/browser/media/chrome_webrtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc
@@ -40,7 +40,15 @@
}
};
-IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) {
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
+// http://crbug.com/396505
+#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \
+ DISABLED_RunsAudioVideoWebRTCCallInTwoTabs
+#else
+#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTabs
+#endif
+IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
+ MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) {
if (OnWinXp()) return;
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698