OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "chrome/browser/media/webrtc_browsertest_base.h" | 7 #include "chrome/browser/media/webrtc_browsertest_base.h" |
8 #include "chrome/browser/media/webrtc_browsertest_common.h" | 8 #include "chrome/browser/media/webrtc_browsertest_common.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 | 37 |
38 // Flag used by TestWebAudioMediaStream to force garbage collection. | 38 // Flag used by TestWebAudioMediaStream to force garbage collection. |
39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); | 39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); |
40 } | 40 } |
41 }; | 41 }; |
42 | 42 |
43 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
44 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ | 44 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ |
45 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs | 45 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs |
46 #else | 46 #else |
47 // TODO(pkasting): http://crbug.com/471132 Temporarily disabled this test due to | |
48 // unexplained failure. | |
49 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ | 47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ |
50 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs | 48 RunsAudioVideoWebRTCCallInTwoTabs |
51 #endif | 49 #endif |
52 | 50 |
53 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | 51 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
54 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { | 52 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { |
55 if (OnWinXp()) return; | 53 if (OnWinXp()) return; |
56 | 54 |
57 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 55 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
58 | 56 |
59 content::WebContents* left_tab = | 57 content::WebContents* left_tab = |
60 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 58 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
(...skipping 24 matching lines...) Expand all Loading... |
85 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); | 83 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
86 ui_test_utils::NavigateToURL(browser(), url); | 84 ui_test_utils::NavigateToURL(browser(), url); |
87 content::WebContents* tab = | 85 content::WebContents* tab = |
88 browser()->tab_strip_model()->GetActiveWebContents(); | 86 browser()->tab_strip_model()->GetActiveWebContents(); |
89 | 87 |
90 // A sleep is necessary to be able to detect the crash. | 88 // A sleep is necessary to be able to detect the crash. |
91 test::SleepInJavascript(tab, 1000); | 89 test::SleepInJavascript(tab, 1000); |
92 | 90 |
93 ASSERT_FALSE(tab->IsCrashed()); | 91 ASSERT_FALSE(tab->IsCrashed()); |
94 } | 92 } |
OLD | NEW |