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 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) { | 43 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
44 // http://crbug.com/396505 | |
45 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs DISABLED_RunsAudioVideoWebRTCCal lInTwoTabs | |
viettrungluu
2014/07/23 15:29:28
nit: avoid the long lines
jam
2014/07/23 16:03:11
Done.
| |
46 #else | |
47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTab s | |
48 #endif | |
49 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | |
50 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { | |
44 if (OnWinXp()) return; | 51 if (OnWinXp()) return; |
45 | 52 |
46 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 53 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
47 | 54 |
48 content::WebContents* left_tab = | 55 content::WebContents* left_tab = |
49 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 56 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
50 content::WebContents* right_tab = | 57 content::WebContents* right_tab = |
51 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 58 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
52 | 59 |
53 SetupPeerconnectionWithLocalStream(left_tab); | 60 SetupPeerconnectionWithLocalStream(left_tab); |
(...skipping 20 matching lines...) Expand all Loading... | |
74 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); | 81 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
75 ui_test_utils::NavigateToURL(browser(), url); | 82 ui_test_utils::NavigateToURL(browser(), url); |
76 content::WebContents* tab = | 83 content::WebContents* tab = |
77 browser()->tab_strip_model()->GetActiveWebContents(); | 84 browser()->tab_strip_model()->GetActiveWebContents(); |
78 | 85 |
79 // A sleep is necessary to be able to detect the crash. | 86 // A sleep is necessary to be able to detect the crash. |
80 test::SleepInJavascript(tab, 1000); | 87 test::SleepInJavascript(tab, 1000); |
81 | 88 |
82 ASSERT_FALSE(tab->IsCrashed()); | 89 ASSERT_FALSE(tab->IsCrashed()); |
83 } | 90 } |
OLD | NEW |