components/search_engines/template_url.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: components/search_engines/template_url.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 | « components/search_engines/search_terms_data.cc ('k') | content/browser/accessibility/site_per_process_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/search_engines/template_url.cc

diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc

index f960485238ed9a1855e7a1eb12849187c2c6ee46..a9b6c9b6d7d521de9cd8bf928d73090505dc5d7b 100644

--- a/components/search_engines/template_url.cc

+++ b/components/search_engines/template_url.cc

@@ -28,6 +28,7 @@

#include "net/base/escape.h"

#include "net/base/mime_util.h"

#include "net/base/net_util.h"

+#include "url/gurl.h"

namespace {

@@ -1359,7 +1360,7 @@ bool TemplateURL::ReplaceSearchTermsInURL(

std::string new_params(old_params, 0, search_terms_position.begin);

new_params += base::UTF16ToUTF8(search_terms_args.search_terms);

new_params += old_params.substr(search_terms_position.end());

- url::StdStringReplacements<std::string> replacements;

+ GURL::Replacements replacements;

if (search_term_component == url::Parsed::REF)

replacements.SetRefStr(new_params);

else