| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 33e294510546c2c6512cf7824fdd871b3af6f8a6..56a54ec109d796af0839e020e8574b86c732ecbf 100644
|
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -518,17 +518,10 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| expected_result);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -// Timing out on Winodws 7 bot: http://crbug.com/443294
|
| -#define MAYBE_TwoGetUserMediaWithFirst1080pSecondVga\
|
| - DISABLED_TwoGetUserMediaWithFirst1080pSecondVga
|
| -#else
|
| -#define MAYBE_TwoGetUserMediaWithFirst1080pSecondVga\
|
| - TwoGetUserMediaWithFirst1080pSecondVga
|
| -#endif
|
| -
|
| +// Timing out on Windows 7 bot: http://crbug.com/443294
|
| +// Flaky: http://crbug.com/660656; possible the test is too perf sensitive.
|
| IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| - MAYBE_TwoGetUserMediaWithFirst1080pSecondVga) {
|
| + DISABLED_TwoGetUserMediaWithFirst1080pSecondVga) {
|
| std::string constraints1 =
|
| "{video: {mandatory: {maxWidth:1920 , minWidth:1920 , maxHeight: 1080,\
|
| minHeight: 1080}}}";
|
|
|