Revert of Move JoinString to the base namespace

components/translate/core/browser/translate_prefs.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/translate/core/browser/translate_prefs.h"
 
 #include <set>
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 308 matching lines @@
   const char* key = accept_languages_pref_.c_str();
 #endif
 
   std::string languages_str = prefs_->GetString(key);
   base::SplitString(languages_str, ',', languages);
 }
 
 void TranslatePrefs::UpdateLanguageList(
     const std::vector<std::string>& languages) {
 #if defined(OS_CHROMEOS)
-  std::string languages_str = base::JoinString(languages, ",");
+  std::string languages_str = JoinString(languages, ',');
   prefs_->SetString(preferred_languages_pref_.c_str(), languages_str);
 #endif
 
   // Save the same language list as accept languages preference as well, but we
   // need to expand the language list, to make it more acceptable. For instance,
   // 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 = base::JoinString(accept_languages, ",");
+  std::string accept_languages_str = JoinString(accept_languages, ',');
   prefs_->SetString(accept_languages_pref_.c_str(), accept_languages_str);
 }
 
 bool TranslatePrefs::CanTranslateLanguage(
     TranslateAcceptLanguages* accept_languages,
     const std::string& language) {
   bool can_be_accept_language =
       TranslateAcceptLanguages::CanBeAcceptLanguage(language);
   bool is_accept_language = accept_languages->IsAcceptLanguage(language);
 
@@ skipping 129 matching lines @@
          it != blocked_languages.end(); ++it) {
       std::string lang = *it;
       translate::ToChromeLanguageSynonym(&lang);
       bool not_found =
           std::find(accept_languages.begin(), accept_languages.end(), lang) ==
           accept_languages.end();
       if (not_found)
         accept_languages.push_back(lang);
     }
 
-    std::string new_accept_languages_str =
-        base::JoinString(accept_languages, ",");
+    std::string new_accept_languages_str = JoinString(accept_languages, ",");
     user_prefs->SetString(accept_languages_pref, new_accept_languages_str);
   }
 }
 
 // static
 void TranslatePrefs::CreateBlockedLanguages(
     std::vector<std::string>* blocked_languages,
     const std::vector<std::string>& blacklisted_languages,
     const std::vector<std::string>& accept_languages) {
   DCHECK(blocked_languages);
@@ skipping 75 matching lines @@
   const base::ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist == NULL || blacklist->empty());
 }
 
 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
   const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }
 
 }  // namespace translate