chrome/browser/ui/login/login_prompt_browsertest.cc - Issue 889463003: GURL::Replacements methods accept a StringPiece instead of std::string&.

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 889463003: GURL::Replacements methods accept a StringPiece instead of std::string&. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase (fixed some merge conflicts). Created 5 years, 10 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/ui/blocked_content/popup_blocker_browsertest.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc » ('j') | no next file with comments »
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 8ef34515cd0d299c887b6a19663d3ea8669ffd83..c5d64431e5e8e61d5f527bba0b0ca7c2497a7c7c 100644

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

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

@@ -661,9 +661,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

// Change the host from 127.0.0.1 to www.a.com so that when the

// page tries to load from b, it will be cross-origin.

- std::string new_host("www.a.com");

GURL::Replacements replacements;

- replacements.SetHostStr(new_host);

+ replacements.SetHostStr("www.a.com");

test_page = test_page.ReplaceComponents(replacements);

WindowedLoadStopObserver load_stop_waiter(controller, 1);

@@ -683,9 +682,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

// Change the host from 127.0.0.1 to www.b.com so that when the

// page tries to load from b, it will be same-origin.

- std::string new_host("www.b.com");

GURL::Replacements replacements;

- replacements.SetHostStr(new_host);

+ replacements.SetHostStr("www.b.com");

test_page = test_page.ReplaceComponents(replacements);

WindowedAuthNeededObserver auth_needed_waiter(controller);

@@ -731,9 +729,9 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

// Change the host from 127.0.0.1 to www.a.com so that when the

// page tries to load from b, it will be cross-origin.

- std::string new_host("www.a.com");

+ static const char kNewHost[] = "www.a.com";

GURL::Replacements replacements;

- replacements.SetHostStr(new_host);

+ replacements.SetHostStr(kNewHost);

test_page = test_page.ReplaceComponents(replacements);

WindowedAuthNeededObserver auth_needed_waiter(controller);

@@ -751,7 +749,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,

// When a cross origin iframe displays a login prompt, the blank

// interstitial shouldn't be displayed and the omnibox should show the

// main frame's url, not the iframe's.

- EXPECT_EQ(new_host, contents->GetVisibleURL().host());

+ EXPECT_EQ(kNewHost, contents->GetVisibleURL().host());

handler->CancelAuth();

auth_cancelled_waiter.Wait();