content/browser/devtools/site_per_process_devtools_browsertest.cc - Issue 1486633002: Removing test_server() and switching over to embedded_test_server.

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: content/browser/devtools/site_per_process_devtools_browsertest.cc

Issue 1486633002: Removing test_server() and switching over to embedded_test_server. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More fixes. Created 5 years, 1 month 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/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc ('k') | content/browser/resource_loading_browsertest.cc » ('j') | content/browser/resource_loading_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/site_per_process_devtools_browsertest.cc

diff --git a/content/browser/devtools/site_per_process_devtools_browsertest.cc b/content/browser/devtools/site_per_process_devtools_browsertest.cc

index 661ab8f26334d8e16970a38d8294abce1fd8ef22..489cd50a0434206c0a1162db9cd62594e23c13cb 100644

--- a/content/browser/devtools/site_per_process_devtools_browsertest.cc

+++ b/content/browser/devtools/site_per_process_devtools_browsertest.cc

@@ -109,8 +109,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest,

IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest, AgentHostForFrames) {

host_resolver()->AddRule("*", "127.0.0.1");

- ASSERT_TRUE(test_server()->Start());

- GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));

+ GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html"));

NavigateToURL(shell(), main_url);

scoped_refptr<DevToolsAgentHost> page_agent =

@@ -127,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest, AgentHostForFrames) {

// Load same-site page into iframe.

FrameTreeNode* child = root->child_at(0);

- GURL http_url(test_server()->GetURL("files/title1.html"));

+ GURL http_url(embedded_test_server()->GetURL("/title1.html"));

NavigateFrameToURL(child, http_url);

scoped_refptr<DevToolsAgentHost> child_frame_agent =

@@ -136,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest, AgentHostForFrames) {

// Load cross-site page into iframe.

GURL::Replacements replace_host;

- GURL cross_site_url(test_server()->GetURL("files/title2.html"));

+ GURL cross_site_url(embedded_test_server()->GetURL("/title2.html"));

replace_host.SetHostStr("foo.com");

cross_site_url = cross_site_url.ReplaceComponents(replace_host);

NavigateFrameToURL(root->child_at(0), cross_site_url);