| 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 e8d86a5c7efced2a8df5e1bd7dadd3a6b7f53cdd..2a297a6158824693e37a62237bf212fe78c46cf3 100644
|
| --- a/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| @@ -466,8 +466,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| expected_result);
|
| }
|
|
|
| -#if defined(OS_WIN) && !defined(NDEBUG)
|
| -// Flaky on Webkit Win7 Debug bot: http://crbug.com/417756
|
| +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG))
|
| +// Flaky on Windows and on Linux Debug: http://crbug.com/417756
|
| #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
|
| DISABLED_TwoGetUserMediaWithFirstHdSecondVga
|
| #else
|
|
|