chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.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: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.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/login/login_prompt_browsertest.cc ('k') | content/browser/devtools/site_per_process_devtools_browsertest.cc » ('j') | content/browser/resource_loading_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

index c9b8c2b099230c5989de8f27460d851fe7913f10..6ebb1b9bee53470060a77fdd098be8306c3787fa 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

@@ -220,10 +220,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,

profile_manager->RegisterTestingProfile(other_profile, true, false);

// Use a couple same-site HTTP URLs.

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

+ ASSERT_TRUE(embedded_test_server()->Start());

std::vector<GURL> urls;

- urls.push_back(test_server()->GetURL("files/title1.html"));

- urls.push_back(test_server()->GetURL("files/title2.html"));

+ urls.push_back(embedded_test_server()->GetURL("/title1.html"));

+ urls.push_back(embedded_test_server()->GetURL("/title2.html"));

// Set the startup preference to open these URLs.

SessionStartupPref other_prefs(SessionStartupPref::URLS);