Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side Diff: chrome/browser/media/chrome_webrtc_browsertest.cc

Issue 1152333004: Revert of Disable RunsAudioVideoWebRTCCallInTwoTabs so blink can roll (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // Disable unconditionally to enable blink roll. Sample failure: 43 #if defined(OS_CHROMEOS)
44 // http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_ rel_ng/builds/66651
45 //#if defined(OS_CHROMEOS)
46 #if 1
47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ 44 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \
48 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs 45 DISABLED_RunsAudioVideoWebRTCCallInTwoTabs
49 #else 46 #else
50 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ 47 #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \
51 RunsAudioVideoWebRTCCallInTwoTabs 48 RunsAudioVideoWebRTCCallInTwoTabs
52 #endif 49 #endif
53 50
54 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 51 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
55 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { 52 MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) {
56 if (OnWinXp()) return; 53 if (OnWinXp()) return;
(...skipping 29 matching lines...) Expand all
86 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); 83 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
87 ui_test_utils::NavigateToURL(browser(), url); 84 ui_test_utils::NavigateToURL(browser(), url);
88 content::WebContents* tab = 85 content::WebContents* tab =
89 browser()->tab_strip_model()->GetActiveWebContents(); 86 browser()->tab_strip_model()->GetActiveWebContents();
90 87
91 // A sleep is necessary to be able to detect the crash. 88 // A sleep is necessary to be able to detect the crash.
92 test::SleepInJavascript(tab, 1000); 89 test::SleepInJavascript(tab, 1000);
93 90
94 ASSERT_FALSE(tab->IsCrashed()); 91 ASSERT_FALSE(tab->IsCrashed());
95 } 92 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698