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

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

Issue 293123009: Cleaned up WebRTC browser test js, removed unneeded stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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/file_util.h" 6 #include "base/file_util.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process/launch.h" 10 #include "base/process/launch.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 static const bool kRunTestsWithFlag[] = { false, true }; 133 static const bool kRunTestsWithFlag[] = { false, true };
134 INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests, 134 INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests,
135 WebRtcBrowserTest, 135 WebRtcBrowserTest,
136 testing::ValuesIn(kRunTestsWithFlag)); 136 testing::ValuesIn(kRunTestsWithFlag));
137 137
138 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, 138 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
139 MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) { 139 MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
140 if (OnWinXp()) return; 140 if (OnWinXp()) return;
141 141
142 ASSERT_TRUE(test::HasReferenceFilesInCheckout());
143 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 142 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
144 143
145 content::WebContents* left_tab = 144 content::WebContents* left_tab =
146 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); 145 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
147 content::WebContents* right_tab = 146 content::WebContents* right_tab =
148 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); 147 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
149 148
150 SetupPeerconnectionWithLocalStream(left_tab); 149 SetupPeerconnectionWithLocalStream(left_tab);
151 SetupPeerconnectionWithLocalStream(right_tab); 150 SetupPeerconnectionWithLocalStream(right_tab);
152 151
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); 271 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
273 ui_test_utils::NavigateToURL(browser(), url); 272 ui_test_utils::NavigateToURL(browser(), url);
274 content::WebContents* tab = 273 content::WebContents* tab =
275 browser()->tab_strip_model()->GetActiveWebContents(); 274 browser()->tab_strip_model()->GetActiveWebContents();
276 275
277 // A sleep is necessary to be able to detect the crash. 276 // A sleep is necessary to be able to detect the crash.
278 test::SleepInJavascript(tab, 1000); 277 test::SleepInJavascript(tab, 1000);
279 278
280 ASSERT_FALSE(tab->IsCrashed()); 279 ASSERT_FALSE(tab->IsCrashed());
281 } 280 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | chrome/test/data/webrtc/manual/peerconnection.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698