Revert of Move JoinString to the base namespace

components/search_engines/default_search_policy_handler.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/search_engines/default_search_policy_handler.h"
 
 #include "base/prefs/pref_value_map.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 151 matching lines @@
 
   base::ListValue::const_iterator iter(list->begin());
   base::ListValue::const_iterator end(list->end());
   std::vector<std::string> string_parts;
   for (; iter != end; ++iter) {
     std::string s;
     if ((*iter)->GetAsString(&s)) {
       string_parts.push_back(s);
     }
   }
-  std::string encodings = base::JoinString(string_parts, ";");
+  std::string encodings = JoinString(string_parts, ';');
   prefs->SetString(prefs::kDefaultSearchProviderEncodings, encodings);
 }
 
 
 // DefaultSearchPolicyHandler implementation -----------------------------------
 
 DefaultSearchPolicyHandler::DefaultSearchPolicyHandler() {
   for (size_t i = 0; i < arraysize(kDefaultSearchPolicyMap); ++i) {
     const char* policy_name = kDefaultSearchPolicyMap[i].policy_name;
     if (policy_name == key::kDefaultSearchProviderEncodings) {
@@ skipping 177 matching lines @@
 void DefaultSearchPolicyHandler::EnsureListPrefExists(
     PrefValueMap* prefs,
     const std::string& path) {
   base::Value* value;
   base::ListValue* list_value;
   if (!prefs->GetValue(path, &value) || !value->GetAsList(&list_value))
     prefs->SetValue(path, make_scoped_ptr(new base::ListValue()));
 }
 
 }  // namespace policy