Revert of Move JoinString to the base namespace

chrome/common/extensions/permissions/permission_set_unittest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
   PermissionIDSet set;
   for (const APIPermission* permission : permissions)
     set.insert(permission->id());
   return set;
 }
 
 std::string LegacyPermissionIDsToString(const PermissionMessageIDs& ids) {
   std::vector<std::string> strs;
   for (const PermissionMessage::ID& id : ids)
     strs.push_back(base::IntToString(id));
-  return base::StringPrintf("[ %s ]", base::JoinString(strs, ", ").c_str());
+  return base::StringPrintf("[ %s ]", JoinString(strs, ", ").c_str());
 }
 
 std::string PermissionIDsToString(const PermissionIDSet& ids) {
   std::vector<std::string> strs;
   for (const PermissionID& id : ids)
     strs.push_back(base::IntToString(id.id()));
-  return base::StringPrintf("[ %s ]", base::JoinString(strs, ", ").c_str());
+  return base::StringPrintf("[ %s ]", JoinString(strs, ", ").c_str());
 }
 
 std::string CoalescedPermissionIDsToString(
     const CoalescedPermissionMessages& msgs) {
   std::vector<std::string> strs;
   for (const CoalescedPermissionMessage& msg : msgs)
     strs.push_back(PermissionIDsToString(msg.permissions()));
-  return base::JoinString(strs, " ");
+  return JoinString(strs, " ");
 }
 
 // Check that the given |permissions| produce a single warning message,
 // identified by |expected_legacy_id| in the old system, and by the set of
 // |expected_ids| in the new system.
 testing::AssertionResult PermissionSetProducesMessage(
     const PermissionSet* permissions,
     Manifest::Type extension_type,
     PermissionMessage::ID expected_legacy_id,
     const PermissionIDSet& expected_ids) {
@@ skipping 1703 matching lines @@
   scoped_refptr<const PermissionSet> permissions_dwr(
       extension_dwr->permissions_data()->active_permissions());
 
   EXPECT_FALSE(PermissionMessageProvider::Get()->
                    IsPrivilegeIncrease(permissions.get(),
                                        permissions_dwr.get(),
                                        extension->GetType()));
 }
 
 }  // namespace extensions