| 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 @@ 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
|
| +#else
|
| +#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTabs
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| + MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) {
|
| if (OnWinXp()) return;
|
|
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
|
|