chrome/browser/media/chrome_webrtc_browsertest.cc - Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/chrome_webrtc_browsertest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/loadtimes_extension_bindings_browsertest.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/chrome_webrtc_browsertest.cc

diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc

index d6373fb76aea0a96cbb0e3f0f487dd7c8b9fb82d..3f97182bef3ac0617e2f02aa90718b1e7b092a40 100644

--- a/chrome/browser/media/chrome_webrtc_browsertest.cc

+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc

@@ -21,7 +21,7 @@

#include "chrome/test/ui/ui_test.h"

#include "content/public/browser/notification_service.h"

#include "content/public/test/browser_test_utils.h"

-#include "net/test/spawned_test_server/spawned_test_server.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

static const base::FilePath::CharType kPeerConnectionServer[] =

#if defined(OS_WIN)

@@ -31,7 +31,7 @@ static const base::FilePath::CharType kPeerConnectionServer[] =

#endif

static const char kMainWebrtcTestHtmlPage[] =

- "files/webrtc/webrtc_jsep01_test.html";

+ "/webrtc/webrtc_jsep01_test.html";

// Top-level integration test for WebRTC. Requires a real webcam and microphone

// on the running system. This test is not meant to run in the main browser

@@ -218,10 +218,10 @@ class WebrtcBrowserTest : public InProcessBrowserTest {

IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,

MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {

- 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);

@@ -230,7 +230,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);