components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc - Issue 1237873004: Revert of Move JoinString to the base namespace

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/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

Issue 1237873004: Revert of Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/autofill/core/common/password_form.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

index 05edc7bcd9f8e00fdbae75bb924f0e7d4493567d..12e1591b1d004857372fc333df695da1717c5465 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

@@ -527,7 +527,7 @@

if (tests[i].allowed && tests[i].fallback_allowed)

proxies.push_back(fallback_origin);

- std::string proxy_rules = "http=" + base::JoinString(proxies, ",") +

+ std::string proxy_rules = "http=" + JoinString(proxies, ",") +

",direct://;" + "https=" + ssl_origin +

",direct://;";

@@ -578,8 +578,7 @@

proxies.push_back(origin);

proxies.push_back(fallback_origin);

- std::string proxy_rules =

- "http=" + base::JoinString(proxies, ",") + ",direct://;";

+ std::string proxy_rules = "http=" + JoinString(proxies, ",") + ",direct://;";

rules.ParseFromString(proxy_rules);