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_CHROMEOS) | 43 // Disable unconditionally to enable blink roll. Sample failure: |
| 44 // http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_
rel_ng/builds/66651 |
| 45 //#if defined(OS_CHROMEOS) |
| 46 #if 1 |
44 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ | 47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ |
45 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs | 48 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs |
46 #else | 49 #else |
47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ | 50 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ |
48 RunsAudioVideoWebRTCCallInTwoTabs | 51 RunsAudioVideoWebRTCCallInTwoTabs |
49 #endif | 52 #endif |
50 | 53 |
51 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | 54 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
52 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { | 55 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { |
53 if (OnWinXp()) return; | 56 if (OnWinXp()) return; |
(...skipping 29 matching lines...) Expand all Loading... |
83 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); | 86 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
84 ui_test_utils::NavigateToURL(browser(), url); | 87 ui_test_utils::NavigateToURL(browser(), url); |
85 content::WebContents* tab = | 88 content::WebContents* tab = |
86 browser()->tab_strip_model()->GetActiveWebContents(); | 89 browser()->tab_strip_model()->GetActiveWebContents(); |
87 | 90 |
88 // A sleep is necessary to be able to detect the crash. | 91 // A sleep is necessary to be able to detect the crash. |
89 test::SleepInJavascript(tab, 1000); | 92 test::SleepInJavascript(tab, 1000); |
90 | 93 |
91 ASSERT_FALSE(tab->IsCrashed()); | 94 ASSERT_FALSE(tab->IsCrashed()); |
92 } | 95 } |
OLD | NEW |