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 22 matching lines...) Expand all Loading... |
33 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); | 33 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); |
34 | 34 |
35 // Always use fake devices. | 35 // Always use fake devices. |
36 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); | 36 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); |
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_WIN) || defined(OS_CHROMEOS) | 43 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) { |
44 // http://crbug.com/396505 | |
45 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ | |
46 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs | |
47 #else | |
48 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTab
s | |
49 #endif | |
50 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | |
51 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { | |
52 if (OnWinXp()) return; | 44 if (OnWinXp()) return; |
53 | 45 |
54 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 46 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
55 | 47 |
56 content::WebContents* left_tab = | 48 content::WebContents* left_tab = |
57 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 49 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
58 content::WebContents* right_tab = | 50 content::WebContents* right_tab = |
59 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 51 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
60 | 52 |
61 SetupPeerconnectionWithLocalStream(left_tab); | 53 SetupPeerconnectionWithLocalStream(left_tab); |
(...skipping 20 matching lines...) Expand all Loading... |
82 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); | 74 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
83 ui_test_utils::NavigateToURL(browser(), url); | 75 ui_test_utils::NavigateToURL(browser(), url); |
84 content::WebContents* tab = | 76 content::WebContents* tab = |
85 browser()->tab_strip_model()->GetActiveWebContents(); | 77 browser()->tab_strip_model()->GetActiveWebContents(); |
86 | 78 |
87 // A sleep is necessary to be able to detect the crash. | 79 // A sleep is necessary to be able to detect the crash. |
88 test::SleepInJavascript(tab, 1000); | 80 test::SleepInJavascript(tab, 1000); |
89 | 81 |
90 ASSERT_FALSE(tab->IsCrashed()); | 82 ASSERT_FALSE(tab->IsCrashed()); |
91 } | 83 } |
OLD | NEW |