Revert of Move JoinString to the base namespace

components/search_engines/template_url.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/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 319 matching lines @@
   }
   if (!search_terms_args.suggest_query_params.empty())
     query_params.push_back(search_terms_args.suggest_query_params);
   if (!gurl.query().empty())
     query_params.push_back(gurl.query());
 
   if (query_params.empty())
     return url;
 
   GURL::Replacements replacements;
-  std::string query_str = base::JoinString(query_params, "&");
+  std::string query_str = JoinString(query_params, "&");
   replacements.SetQueryStr(query_str);
   return gurl.ReplaceComponents(replacements).possibly_invalid_spec();
 }
 
 bool TemplateURLRef::IsValid(const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
   return valid_;
 }
 
 base::string16 TemplateURLRef::DisplayURL(
@@ skipping 1158 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }