diff options
| author | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 09:37:02 +0000 |
|---|---|---|
| committer | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 09:37:02 +0000 |
| commit | e9229e548587f25607417797815c8d159a3d5cbb (patch) | |
| tree | d152075142ac1e2f420b7779a576644fd625d201 /chrome/browser/media | |
| parent | 39495b125eef228f2cfec18334e74f6da4a366a9 (diff) | |
| download | chromium_src-e9229e548587f25607417797815c8d159a3d5cbb.zip chromium_src-e9229e548587f25607417797815c8d159a3d5cbb.tar.gz chromium_src-e9229e548587f25607417797815c8d159a3d5cbb.tar.bz2 | |
Fixed WebRTC browser test.
https://codereview.chromium.org/16268017 updated one test to use the embedded server but not the other, which caused the path to the test page to be incorrect. This patch fixes that.
BUG=
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/18048002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media')
| -rw-r--r-- | chrome/browser/media/chrome_webrtc_browsertest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index 3f97182..40b2d39 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -257,10 +257,10 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_TestMediaStreamTrackEnableDisable) { - EXPECT_TRUE(test_server()->Start()); + EXPECT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL(kMainWebrtcTestHtmlPage)); + browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); content::WebContents* left_tab = browser()->tab_strip_model()->GetActiveWebContents(); GetUserMedia(left_tab); @@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, content::WebContents* right_tab = browser()->tab_strip_model()->GetActiveWebContents(); ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL(kMainWebrtcTestHtmlPage)); + browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); GetUserMedia(right_tab); ConnectToPeerConnectionServer("peer 1", left_tab); |