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

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: Rebased 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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 static const bool kRunTestsWithFlag[] = { false, true }; 44 static const bool kRunTestsWithFlag[] = { false, true };
45 INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests, 45 INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests,
46 WebRtcBrowserTest, 46 WebRtcBrowserTest,
47 testing::ValuesIn(kRunTestsWithFlag)); 47 testing::ValuesIn(kRunTestsWithFlag));
48 48
49 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, 49 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
50 MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) { 50 MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
51 if (OnWinXp()) return; 51 if (OnWinXp()) return;
52 52
53 ASSERT_TRUE(test::HasReferenceFilesInCheckout());
53 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 54 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
54 55
55 content::WebContents* left_tab = 56 content::WebContents* left_tab =
56 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); 57 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
57 content::WebContents* right_tab = 58 content::WebContents* right_tab =
58 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); 59 OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
59 60
60 SetupPeerconnectionWithLocalStream(left_tab); 61 SetupPeerconnectionWithLocalStream(left_tab);
61 SetupPeerconnectionWithLocalStream(right_tab); 62 SetupPeerconnectionWithLocalStream(right_tab);
62 63
(...skipping 18 matching lines...) Expand all
81 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); 82 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
82 ui_test_utils::NavigateToURL(browser(), url); 83 ui_test_utils::NavigateToURL(browser(), url);
83 content::WebContents* tab = 84 content::WebContents* tab =
84 browser()->tab_strip_model()->GetActiveWebContents(); 85 browser()->tab_strip_model()->GetActiveWebContents();
85 86
86 // A sleep is necessary to be able to detect the crash. 87 // A sleep is necessary to be able to detect the crash.
87 test::SleepInJavascript(tab, 1000); 88 test::SleepInJavascript(tab, 1000);
88 89
89 ASSERT_FALSE(tab->IsCrashed()); 90 ASSERT_FALSE(tab->IsCrashed());
90 } 91 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698