Index: content/browser/media/webrtc_getusermedia_browsertest.cc |
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc |
index 382ad1b756591a0adf7be932b30d864b846be2a2..c9933a6b8ccaa6d40f15ac299b3c5981577d4ee1 100644 |
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc |
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc |
@@ -458,8 +458,17 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
expected_result); |
} |
+#if defined(OS_WIN) && !defined(NDEBUG) |
+// Flaky on Webkit Win7 Debug bot: http://crbug.com/417756 |
+#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
+ DISABLED_TwoGetUserMediaWithFirstHdSecondVga |
+#else |
+#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
+ TwoGetUserMediaWithFirstHdSecondVga |
+#endif |
+ |
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
- TwoGetUserMediaWithFirstHdSecondVga) { |
+ MAYBE_TwoGetUserMediaWithFirstHdSecondVga) { |
std::string constraints1 = |
"{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; |
std::string constraints2 = |