chrome/browser/ssl/ssl_browser_tests.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/ssl/ssl_browser_tests.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/search/search.cc ('k') | chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/ssl_browser_tests.cc

diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc

index 4d1ffdc5f137b86284d4beedce12b95dfd010d37..15e727da960bb284996dda9c3d470443d022abeb 100644

--- a/chrome/browser/ssl/ssl_browser_tests.cc

+++ b/chrome/browser/ssl/ssl_browser_tests.cc

@@ -508,8 +508,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) {

// cross-site navigation so we can test http://crbug.com/5800 is gone.

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

GURL::Replacements replacements;

- std::string new_host("localhost");

- replacements.SetHostStr(new_host);

+ replacements.SetHostStr("localhost");

cross_site_url = cross_site_url.ReplaceComponents(replacements);

// Now go to a bad HTTPS page.

@@ -714,9 +713,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndGoForward) {

watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

// Visit bad HTTPS page.

- std::string scheme("https");

GURL::Replacements replacements;

- replacements.SetSchemeStr(scheme);

+ replacements.SetSchemeStr("https");

ui_test_utils::NavigateToURL(

browser(),

wss_server_expired_.GetURL(

@@ -787,9 +785,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, TestWSSClientCert) {

options,

net::GetWebSocketTestDataDirectory());

ASSERT_TRUE(wss_server.Start());

- std::string scheme("https");

GURL::Replacements replacements;

- replacements.SetSchemeStr(scheme);

+ replacements.SetSchemeStr("https");

GURL url = wss_server.GetURL("connect_check.html").ReplaceComponents(

replacements);

@@ -1764,9 +1761,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITestIgnoreCertErrors, TestWSS) {

watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

// Visit bad HTTPS page.

- std::string scheme("https");

GURL::Replacements replacements;

- replacements.SetSchemeStr(scheme);

+ replacements.SetSchemeStr("https");

ui_test_utils::NavigateToURL(

browser(),

wss_server_expired_.GetURL(