Chromium Code Reviews| 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..788e424614597f764fed958ed7ea80716f24ae4d 100644 |
| --- a/chrome/browser/media/chrome_webrtc_browsertest.cc |
| +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc |
| @@ -40,7 +40,14 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
| } |
| }; |
| -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) { |
| +#if defined(OS_WIN) || defined(OS_CHROMEOS) |
| +// http://crbug.com/396505 |
| +#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs DISABLED_RunsAudioVideoWebRTCCallInTwoTabs |
|
viettrungluu
2014/07/23 15:29:28
nit: avoid the long lines
jam
2014/07/23 16:03:11
Done.
|
| +#else |
| +#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTabs |
| +#endif |
| +IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| + MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { |
| if (OnWinXp()) return; |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |