Revert of Move JoinString to the base namespace

chrome/browser/net/firefox_proxy_settings.cc

 // Copyright 2013 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 "chrome/browser/net/firefox_proxy_settings.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 218 matching lines @@
     net::ProxyServer::Scheme proxy_scheme = V5 == socks_version() ?
         net::ProxyServer::SCHEME_SOCKS5 : net::ProxyServer::SCHEME_SOCKS4;
 
     config->proxy_rules().fallback_proxies.SetSingleProxyServer(
         net::ProxyServer(
             proxy_scheme,
             net::HostPortPair(socks_host(), socks_port())));
   }
 
   config->proxy_rules().bypass_rules.ParseFromStringUsingSuffixMatching(
-      base::JoinString(proxy_bypass_list_, ";"));
+      JoinString(proxy_bypass_list_, ';'));
 
   return true;
 }
 
 // static
 bool FirefoxProxySettings::GetSettingsFromFile(const base::FilePath& pref_file,
                                                FirefoxProxySettings* settings) {
   base::DictionaryValue dictionary;
   if (!ParsePrefFile(pref_file, &dictionary))
     return false;
@@ skipping 47 matching lines @@
       while (string_tok.GetNext()) {
         std::string token = string_tok.token();
         base::TrimWhitespaceASCII(token, base::TRIM_ALL, &token);
         if (!token.empty())
           settings->proxy_bypass_list_.push_back(token);
       }
     }
   }
   return true;
 }