Revert of Move JoinString to the base namespace

extensions/common/api/sockets/sockets_manifest_permission.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/common/api/sockets/sockets_manifest_permission.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 113 matching lines @@
   if (!domains.empty()) {
     // TODO(sashab): This is not correct for all languages - add proper
     // internationalization of this string for all plural states.
     if (messages) {
       int id = (domains.size() == 1)
                    ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN
                    : IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS;
       messages->push_back(PermissionMessage(
           PermissionMessage::kSocketDomainHosts,
           l10n_util::GetStringFUTF16(
-              id, base::JoinString(std::vector<base::string16>(domains.begin(),
-                                                               domains.end()),
-                                   base::ASCIIToUTF16(" ")))));
+              id, JoinString(std::vector<base::string16>(domains.begin(),
+                                                         domains.end()),
+                             ' '))));
     }
     if (ids) {
       for (const auto& domain : domains)
         ids->insert(APIPermission::kSocketDomainHosts, domain);
     }
   }
 }
 
 // Helper function for adding specific host socket permissions. Determines what
 // messages are needed from |sockets|, and adds permissions to |ids| and/or
 // |messages|, ignoring them if they are NULL.
 void AddSpecificHostMessage(const SocketPermissionEntrySet& sockets,
                             PermissionIDSet* ids,
                             PermissionMessages* messages) {
   std::set<base::string16> hostnames;
   for (const auto& socket : sockets) {
     if (socket.GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)
       hostnames.insert(base::UTF8ToUTF16(socket.pattern().host));
   }
   if (!hostnames.empty()) {
     // TODO(sashab): This is not correct for all languages - add proper
     // internationalization of this string for all plural states.
     if (messages) {
       int id = (hostnames.size() == 1)
                    ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST
                    : IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS;
       messages->push_back(PermissionMessage(
           PermissionMessage::kSocketSpecificHosts,
           l10n_util::GetStringFUTF16(
-              id, base::JoinString(std::vector<base::string16>(
-                                       hostnames.begin(), hostnames.end()),
-                                   base::ASCIIToUTF16(" ")))));
+              id, JoinString(std::vector<base::string16>(hostnames.begin(),
+                                                         hostnames.end()),
+                             ' '))));
     }
     if (ids) {
       for (const auto& hostname : hostnames)
         ids->insert(APIPermission::kSocketSpecificHosts, hostname);
     }
   }
 }
 
 // Helper function for adding the network list socket permission. Determines if
 // the message is needed from |sockets|, and adds the permission to |ids| and/or
@@ skipping 195 matching lines @@
     PermissionIDSet* ids,
     PermissionMessages* messages) {
   if (!AddAnyHostMessage(sockets, ids, messages)) {
     AddSpecificHostMessage(sockets, ids, messages);
     AddSubdomainHostMessage(sockets, ids, messages);
   }
   AddNetworkListMessage(sockets, ids, messages);
 }
 
 }  // namespace extensions