Revert of Move JoinString to the base namespace

extensions/browser/api/vpn_provider/vpn_provider_api.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 "extensions/browser/api/vpn_provider/vpn_provider_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 94 matching lines @@
       parameters.address, kCIDRSeperator, base::KEEP_WHITESPACE,
       base::SPLIT_WANT_NONEMPTY);
   CHECK_EQ(2u, cidr_parts.size());
 
   parameter_value->SetStringWithoutPathExpansion(
       shill::kAddressParameterThirdPartyVpn, cidr_parts[0]);
 
   parameter_value->SetStringWithoutPathExpansion(
       shill::kSubnetPrefixParameterThirdPartyVpn, cidr_parts[1]);
 
-  std::string ip_delimiter(1, shill::kIPDelimiter);
   parameter_value->SetStringWithoutPathExpansion(
       shill::kExclusionListParameterThirdPartyVpn,
-      base::JoinString(parameters.exclusion_list, ip_delimiter));
+      JoinString(parameters.exclusion_list, shill::kIPDelimiter));
 
   parameter_value->SetStringWithoutPathExpansion(
       shill::kInclusionListParameterThirdPartyVpn,
-      base::JoinString(parameters.inclusion_list, ip_delimiter));
+      JoinString(parameters.inclusion_list, shill::kIPDelimiter));
 
   if (parameters.mtu) {
     parameter_value->SetStringWithoutPathExpansion(
         shill::kMtuParameterThirdPartyVpn, *parameters.mtu);
   }
 
   if (parameters.broadcast_address) {
     parameter_value->SetStringWithoutPathExpansion(
         shill::kBroadcastAddressParameterThirdPartyVpn,
         *parameters.broadcast_address);
   }
 
-  std::string non_ip_delimiter(1, shill::kNonIPDelimiter);
   if (parameters.domain_search) {
     parameter_value->SetStringWithoutPathExpansion(
         shill::kDomainSearchParameterThirdPartyVpn,
-        base::JoinString(*parameters.domain_search, non_ip_delimiter));
+        JoinString(*parameters.domain_search, shill::kNonIPDelimiter));
   }
 
   parameter_value->SetStringWithoutPathExpansion(
       shill::kDnsServersParameterThirdPartyVpn,
-      base::JoinString(parameters.dns_servers, ip_delimiter));
+      JoinString(parameters.dns_servers, shill::kIPDelimiter));
 
   return;
 }
 
 }  // namespace
 
 VpnThreadExtensionFunction::~VpnThreadExtensionFunction() {
 }
 
 void VpnThreadExtensionFunction::SignalCallCompletionSuccess() {
@@ skipping 168 matching lines @@
                      SignalCallCompletionSuccess,
                  this),
       base::Bind(&VpnProviderNotifyConnectionStateChangedFunction::
                      SignalCallCompletionFailure,
                  this));
 
   return RespondLater();
 }
 
 }  // namespace extensions