Move JoinString to the base namespace.

Change "Separator" from string to StringPIece (most are constants). Remove char versions for symmetry with SplitString.

Update callers who pass empty separators to use a base::StringPiece()

Change chromecast/base/metrics/cast_metrics_helper.cc to not use JoinString at all and just append to the output (code is simpler and faster).

TBR=zelidrag@chromium.org for chromeos

Review URL: https://codereview.chromium.org/1223153003

Cr-Commit-Position: refs/heads/master@{#338762}

26 files changed, 39 insertions, 32 deletions

diff --git a/components/autofill/content/browser/wallet/wallet_address.cc b/components/autofill/content/browser/wallet/wallet_address.cc
index 6fa2453..0e11196 100644
--- a/components/autofill/content/browser/wallet/wallet_address.cc
+++ b/components/autofill/content/browser/wallet/wallet_address.cc
@@ -340,7 +340,7 @@ base::string16 Address::GetInfo(const AutofillType& type,
       return recipient_name();
 
     case ADDRESS_HOME_STREET_ADDRESS:
-      return JoinString(street_address_, base::ASCIIToUTF16("\n"));
+      return base::JoinString(street_address_, base::ASCIIToUTF16("\n"));
 
     case ADDRESS_HOME_LINE1:
       return GetStreetAddressLine(0);
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 3412281..ef46edb 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -503,7 +503,7 @@ void AutofillAgent::AcceptDataListSuggestion(
     last_part.append(suggested_value);
     parts[parts.size() - 1] = last_part;
 
-    new_value = JoinString(parts, ',');
+    new_value = base::JoinString(parts, base::ASCIIToUTF16(","));
   }
   FillFieldWithValue(new_value, input_element);
 }
diff --git a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
index d6b95e9..3544f4d 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
@@ -269,7 +269,8 @@ TEST_F(MAYBE_PasswordFormConversionUtilsTest, IdentifyingUsernameFields) {
         EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_username_value),
                   password_form->username_value);
         EXPECT_EQ(base::UTF8ToUTF16(cases[i].expected_other_possible_usernames),
-                  JoinString(password_form->other_possible_usernames, '+'));
+                  base::JoinString(password_form->other_possible_usernames,
+                                   base::ASCIIToUTF16("+")));
       } else {
         EXPECT_TRUE(password_form->username_value.empty());
         EXPECT_TRUE(password_form->other_possible_usernames.empty());
diff --git a/components/autofill/core/browser/address.cc b/components/autofill/core/browser/address.cc
index 9aaa3b6..389bed2 100644
--- a/components/autofill/core/browser/address.cc
+++ b/components/autofill/core/browser/address.cc
@@ -71,7 +71,7 @@ base::string16 Address::GetRawInfo(ServerFieldType type) const {
       return base::ASCIIToUTF16(country_code_);
 
     case ADDRESS_HOME_STREET_ADDRESS:
-      return JoinString(street_address_, '\n');
+      return base::JoinString(street_address_, base::ASCIIToUTF16("\n"));
 
     default:
       NOTREACHED();
diff --git a/components/autofill/core/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc
index 7012a9b..bec1121 100644
--- a/components/autofill/core/browser/autofill_profile.cc
+++ b/components/autofill/core/browser/autofill_profile.cc
@@ -328,7 +328,7 @@ base::string16 AutofillProfile::GetInfo(const AutofillType& type,
 
     std::vector<std::string> lines;
     ::i18n::addressinput::GetFormattedNationalAddress(*address_data, &lines);
-    return base::UTF8ToUTF16(JoinString(lines, '\n'));
+    return base::UTF8ToUTF16(base::JoinString(lines, "\n"));
   }
 
   const FormGroup* form_group = FormGroupForType(type);
diff --git a/components/autofill/core/browser/contact_info.cc b/components/autofill/core/browser/contact_info.cc
index 6e13759..ccb45cc 100644
--- a/components/autofill/core/browser/contact_info.cc
+++ b/components/autofill/core/browser/contact_info.cc
@@ -125,7 +125,7 @@ NameParts SplitName(const base::string16& name) {
 
   std::vector<base::string16> family_tokens(reverse_family_tokens.rbegin(),
                                             reverse_family_tokens.rend());
-  parts.family = JoinString(family_tokens, base::char16(' '));
+  parts.family = base::JoinString(family_tokens, base::ASCIIToUTF16(" "));
 
   // Take the last remaining token as the middle name (if there are at least 2
   // tokens).
@@ -135,7 +135,7 @@ NameParts SplitName(const base::string16& name) {
   }
 
   // Remainder is given name.
-  parts.given = JoinString(name_tokens, base::char16(' '));
+  parts.given = base::JoinString(name_tokens, base::ASCIIToUTF16(" "));
 
   return parts;
 }
@@ -262,7 +262,7 @@ base::string16 NameInfo::FullName() const {
   if (!family_.empty())
     full_name.push_back(family_);
 
-  return JoinString(full_name, ' ');
+  return base::JoinString(full_name, base::ASCIIToUTF16(" "));
 }
 
 base::string16 NameInfo::MiddleInitial() const {
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
index e49fda7..3fed7f6 100644
--- a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
+++ b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
@@ -82,7 +82,7 @@ AutofillProfile ProfileFromSpecifics(
   std::vector<std::string> street_address(address.street_address().begin(),
                                           address.street_address().end());
   profile.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS,
-                     base::UTF8ToUTF16(JoinString(street_address, '\n')));
+                     base::UTF8ToUTF16(base::JoinString(street_address, "\n")));
 
   profile.SetRawInfo(COMPANY_NAME, base::UTF8ToUTF16(address.company_name()));
   profile.SetRawInfo(ADDRESS_HOME_STATE,
diff --git a/components/autofill/core/common/password_form.cc b/components/autofill/core/common/password_form.cc
index fdd6144..0f369db 100644
--- a/components/autofill/core/common/password_form.cc
+++ b/components/autofill/core/common/password_form.cc
@@ -36,7 +36,8 @@ void PasswordFormToJSON(const PasswordForm& form,
   target->SetBoolean("new_password_marked_by_site",
                      form.new_password_marked_by_site);
   target->SetString("other_possible_usernames",
-                    JoinString(form.other_possible_usernames, '|'));
+                    base::JoinString(form.other_possible_usernames,
+                                     base::ASCIIToUTF16("|")));
   target->SetBoolean("blacklisted", form.blacklisted_by_user);
   target->SetBoolean("preferred", form.preferred);
   target->SetBoolean("ssl_valid", form.ssl_valid);
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 12e1591..05edc7b 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 @@ TEST_F(DataReductionProxyConfigTest, AreProxiesBypassed) {
     if (tests[i].allowed && tests[i].fallback_allowed)
       proxies.push_back(fallback_origin);
 
-    std::string proxy_rules = "http=" + JoinString(proxies, ",") +
+    std::string proxy_rules = "http=" + base::JoinString(proxies, ",") +
                               ",direct://;" + "https=" + ssl_origin +
                               ",direct://;";
 
@@ -578,7 +578,8 @@ TEST_F(DataReductionProxyConfigTest, AreProxiesBypassedRetryDelay) {
   proxies.push_back(origin);
   proxies.push_back(fallback_origin);
 
-  std::string proxy_rules = "http=" + JoinString(proxies, ",") + ",direct://;";
+  std::string proxy_rules =
+      "http=" + base::JoinString(proxies, ",") + ",direct://;";
 
   rules.ParseFromString(proxy_rules);
 
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc
index 9bfd9bd..f39d95e 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc
@@ -63,7 +63,7 @@ void DataReductionProxyConfigurator::Enable(
   }
 
   config.proxy_rules().bypass_rules.ParseFromString(
-      JoinString(bypass_rules_, ", "));
+      base::JoinString(bypass_rules_, ", "));
   // The ID is set to a bogus value. It cannot be left uninitialized, else the
   // config will return invalid.
   net::ProxyConfig::ID unused_id = 1;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
index 8717fcb..6a55084 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc
@@ -398,7 +398,7 @@ void DataReductionProxyRequestOptions::RegenerateRequestHeaderValue() {
   for (const auto& experiment : experiments_)
     headers.push_back(FormatOption(kExperimentsOption, experiment));
 
-  header_value_ = JoinString(headers, ", ");
+  header_value_ = base::JoinString(headers, ", ");
 }
 
 }  // namespace data_reduction_proxy
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
index 99eb96e..a48459f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
@@ -129,7 +129,7 @@ void SetHeaderExpectations(const std::string& session,
         std::string(kExperimentsOption) + "=" + experiment);
   }
   if (!expected_options.empty())
-    *expected_header = JoinString(expected_options, ", ");
+    *expected_header = base::JoinString(expected_options, ", ");
 }
 
 }  // namespace
diff --git a/components/history/core/browser/top_sites_database.cc b/components/history/core/browser/top_sites_database.cc
index 74ab115..d1f024d 100644
--- a/components/history/core/browser/top_sites_database.cc
+++ b/components/history/core/browser/top_sites_database.cc
@@ -85,7 +85,7 @@ std::string GetRedirects(const MostVisitedURL& url) {
   std::vector<std::string> redirects;
   for (size_t i = 0; i < url.redirects.size(); i++)
     redirects.push_back(url.redirects[i].spec());
-  return JoinString(redirects, ' ');
+  return base::JoinString(redirects, " ");
 }
 
 // Decodes redirects from a string and sets them for the url.
diff --git a/components/nacl/renderer/platform_info.cc b/components/nacl/renderer/platform_info.cc
index 712526c..22edf18 100644
--- a/components/nacl/renderer/platform_info.cc
+++ b/components/nacl/renderer/platform_info.cc
@@ -75,7 +75,7 @@ std::string GetCpuFeatures() {
   else if (cpu.has_sse2()) features.push_back("+sse2");
 
   // TODO: AES, POPCNT, LZCNT, ...
-  return JoinString(features, ',');
+  return base::JoinString(features, ",");
 }
 
 }  // namespace nacl
diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index 04411b6..3360c3d 100644
--- a/components/policy/core/browser/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -186,7 +186,7 @@ base::string16 PolicyErrorMap::GetErrors(const std::string& policy) {
   std::vector<base::string16> list;
   for (const_iterator it = range.first; it != range.second; ++it)
     list.push_back(it->second);
-  return JoinString(list, '\n');
+  return base::JoinString(list, base::ASCIIToUTF16("\n"));
 }
 
 bool PolicyErrorMap::empty() {
diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc
index 7c07fc2..834e42a 100644
--- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc
@@ -93,7 +93,7 @@ void CryptAuthGCMManagerImpl::OnMessage(const std::string& app_id,
   PA_LOG(INFO) << "GCM message received:\n"
                << "  sender_id: " << message.sender_id << "\n"
                << "  collapse_key: " << message.collapse_key << "\n"
-               << "  data:\n    " << JoinString(fields, "\n    ");
+               << "  data:\n    " << base::JoinString(fields, "\n    ");
 
   if (message.data.find(kRegistrationTickleTypeKey) == message.data.end()) {
     PA_LOG(WARNING) << "GCM message does not contain 'registrationTickleType'.";
diff --git a/components/search_engines/default_search_policy_handler.cc b/components/search_engines/default_search_policy_handler.cc
index 573af72..38df010 100644
--- a/components/search_engines/default_search_policy_handler.cc
+++ b/components/search_engines/default_search_policy_handler.cc
@@ -169,7 +169,7 @@ void DefaultSearchEncodingsPolicyHandler::ApplyPolicySettings(
       string_parts.push_back(s);
     }
   }
-  std::string encodings = JoinString(string_parts, ';');
+  std::string encodings = base::JoinString(string_parts, ";");
   prefs->SetString(prefs::kDefaultSearchProviderEncodings, encodings);
 }
 
diff --git a/components/search_engines/default_search_pref_migration_unittest.cc b/components/search_engines/default_search_pref_migration_unittest.cc
index 6d1b6ea..73d9d0b 100644
--- a/components/search_engines/default_search_pref_migration_unittest.cc
+++ b/components/search_engines/default_search_pref_migration_unittest.cc
@@ -91,7 +91,7 @@ void DefaultSearchPrefMigrationTest::SaveDefaultSearchProviderToLegacyPrefs(
     GURL icon_gurl = t_url->favicon_url();
     if (!icon_gurl.is_empty())
       icon_url = icon_gurl.spec();
-    encodings = JoinString(t_url->input_encodings(), ';');
+    encodings = base::JoinString(t_url->input_encodings(), ";");
     short_name = base::UTF16ToUTF8(t_url->short_name());
     keyword = base::UTF16ToUTF8(t_url->keyword());
     id_string = base::Int64ToString(t_url->id());
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc
index 7de6217..a4ad483 100644
--- a/components/search_engines/keyword_table.cc
+++ b/components/search_engines/keyword_table.cc
@@ -80,7 +80,7 @@ const std::string ColumnsForVersion(int version, bool concatenated) {
     columns.push_back("new_tab_url");
   }
 
-  return JoinString(columns, std::string(concatenated ? " || " : ", "));
+  return base::JoinString(columns, std::string(concatenated ? " || " : ", "));
 }
 
 
@@ -115,7 +115,8 @@ void BindURLToStatement(const TemplateURLData& data,
       std::string());
   s->BindInt64(starting_column + 6, data.date_created.ToTimeT());
   s->BindInt(starting_column + 7, data.usage_count);
-  s->BindString(starting_column + 8, JoinString(data.input_encodings, ';'));
+  s->BindString(starting_column + 8,
+                base::JoinString(data.input_encodings, ";"));
   s->BindBool(starting_column + 9, data.show_in_default_list);
   s->BindString(starting_column + 10, data.suggestions_url);
   s->BindInt(starting_column + 11, data.prepopulate_id);
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 8202fa4..dbb74fc 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -337,7 +337,7 @@ std::string TemplateURLRef::ReplaceSearchTerms(
     return url;
 
   GURL::Replacements replacements;
-  std::string query_str = JoinString(query_params, "&");
+  std::string query_str = base::JoinString(query_params, "&");
   replacements.SetQueryStr(query_str);
   return gurl.ReplaceComponents(replacements).possibly_invalid_spec();
 }
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 7ba2ff0..12abbe8 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -1197,7 +1197,8 @@ syncer::SyncData TemplateURLService::CreateSyncDataFromTemplateURL(
   se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace());
   se_specifics->set_originating_url(turl.originating_url().spec());
   se_specifics->set_date_created(turl.date_created().ToInternalValue());
-  se_specifics->set_input_encodings(JoinString(turl.input_encodings(), ';'));
+  se_specifics->set_input_encodings(
+      base::JoinString(turl.input_encodings(), ";"));
   se_specifics->set_show_in_default_list(turl.show_in_default_list());
   se_specifics->set_suggestions_url(turl.suggestions_url());
   se_specifics->set_prepopulate_id(turl.prepopulate_id());
diff --git a/components/search_engines/template_url_service_sync_unittest.cc b/components/search_engines/template_url_service_sync_unittest.cc
index 66a6123..d411256 100644
--- a/components/search_engines/template_url_service_sync_unittest.cc
+++ b/components/search_engines/template_url_service_sync_unittest.cc
@@ -68,7 +68,8 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl,
   se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace());
   se_specifics->set_originating_url(turl.originating_url().spec());
   se_specifics->set_date_created(turl.date_created().ToInternalValue());
-  se_specifics->set_input_encodings(JoinString(turl.input_encodings(), ';'));
+  se_specifics->set_input_encodings(
+      base::JoinString(turl.input_encodings(), ";"));
   se_specifics->set_show_in_default_list(turl.show_in_default_list());
   se_specifics->set_suggestions_url(turl.suggestions_url());
   se_specifics->set_prepopulate_id(turl.prepopulate_id());
diff --git a/components/signin/core/browser/gaia_cookie_manager_service.cc b/components/signin/core/browser/gaia_cookie_manager_service.cc
index 4beff36..dcc74ae 100644
--- a/components/signin/core/browser/gaia_cookie_manager_service.cc
+++ b/components/signin/core/browser/gaia_cookie_manager_service.cc
@@ -114,7 +114,7 @@ GaiaCookieManagerService::ExternalCcResultFetcher::GetExternalCcResult() {
        ++it) {
     results.push_back(it->first + ":" + it->second);
   }
-  return JoinString(results, ",");
+  return base::JoinString(results, ",");
 }
 
 void GaiaCookieManagerService::ExternalCcResultFetcher::Start() {
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index 768be0e..24547005 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -326,7 +326,7 @@ void TranslatePrefs::GetLanguageList(std::vector<std::string>* languages) {
 void TranslatePrefs::UpdateLanguageList(
     const std::vector<std::string>& languages) {
 #if defined(OS_CHROMEOS)
-  std::string languages_str = JoinString(languages, ',');
+  std::string languages_str = base::JoinString(languages, ",");
   prefs_->SetString(preferred_languages_pref_.c_str(), languages_str);
 #endif
 
@@ -335,7 +335,7 @@ void TranslatePrefs::UpdateLanguageList(
   // some web sites don't understand 'en-US' but 'en'. See crosbug.com/9884.
   std::vector<std::string> accept_languages;
   ExpandLanguageCodes(languages, &accept_languages);
-  std::string accept_languages_str = JoinString(accept_languages, ',');
+  std::string accept_languages_str = base::JoinString(accept_languages, ",");
   prefs_->SetString(accept_languages_pref_.c_str(), accept_languages_str);
 }
 
@@ -485,7 +485,8 @@ void TranslatePrefs::MigrateUserPrefs(PrefService* user_prefs,
         accept_languages.push_back(lang);
     }
 
-    std::string new_accept_languages_str = JoinString(accept_languages, ",");
+    std::string new_accept_languages_str =
+        base::JoinString(accept_languages, ",");
     user_prefs->SetString(accept_languages_pref, new_accept_languages_str);
   }
 }
diff --git a/components/view_manager/gesture_manager_unittest.cc b/components/view_manager/gesture_manager_unittest.cc
index cc180b3..feece31 100644
--- a/components/view_manager/gesture_manager_unittest.cc
+++ b/components/view_manager/gesture_manager_unittest.cc
@@ -108,7 +108,7 @@ class TestGestureManagerDelegate : public GestureManagerDelegate {
   ~TestGestureManagerDelegate() override {}
 
   std::string GetAndClearDescriptions() {
-    const std::string result(JoinString(descriptions_, '\n'));
+    const std::string result(base::JoinString(descriptions_, "\n"));
     descriptions_.clear();
     return result;
   }
diff --git a/components/view_manager/test_change_tracker.cc b/components/view_manager/test_change_tracker.cc
index 33e0f96..ac7183d 100644
--- a/components/view_manager/test_change_tracker.cc
+++ b/components/view_manager/test_change_tracker.cc
@@ -133,7 +133,7 @@ std::string ChangeViewDescription(const std::vector<Change>& changes) {
   std::vector<std::string> view_strings(changes[0].views.size());
   for (size_t i = 0; i < changes[0].views.size(); ++i)
     view_strings[i] = "[" + changes[0].views[i].ToString() + "]";
-  return JoinString(view_strings, ',');
+  return base::JoinString(view_strings, ",");
 }
 
 TestView ViewDataToTestView(const ViewDataPtr& data) {