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

Index: chrome/browser/ui/login/login_prompt_browsertest.cc

diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc

index c4a7738c8330398f885bd8572f464f507e4a5289..e768b42ed7daf366ecea5d3c1610f0feec8692f7 100644

--- a/chrome/browser/ui/login/login_prompt_browsertest.cc

+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc

@@ -1433,10 +1433,10 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED);

ASSERT_TRUE(https_server.Start());

- const char* kTestPage = "files/login/load_iframe_from_b.html";

+ const char* kTestPage = "/login/load_iframe_from_b.html";

host_resolver()->AddRule("www.b.com", "127.0.0.1");

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

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

content::WebContents* contents =

browser()->tab_strip_model()->GetActiveWebContents();

@@ -1446,7 +1446,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

// Load a page that has a cross-domain iframe authentication. This should

// trigger a login prompt but no login interstitial.

- GURL test_page = test_server()->GetURL(kTestPage);

+ GURL test_page = embedded_test_server()->GetURL(kTestPage);

GURL broken_ssl_page = https_server.GetURL("/");

ASSERT_EQ("127.0.0.1", test_page.host());

WindowedAuthNeededObserver auth_needed_waiter(controller);