Revert of Move JoinString to the base namespace

chrome/browser/extensions/content_capabilities_browsertest.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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
@@ skipping 56 matching lines @@
   std::string MakeJSONList(const std::string& s0 = "",
                            const std::string& s1 = "",
                            const std::string& s2 = "") {
     std::vector<std::string> v;
     if (!s0.empty())
       v.push_back(s0);
     if (!s1.empty())
       v.push_back(s1);
     if (!s2.empty())
       v.push_back(s2);
-    std::string list = base::JoinString(v, "\",\"");
+    std::string list = JoinString(v, "\",\"");
     if (!list.empty())
       list = "\"" + list + "\"";
     return "[" + list + "]";
   }
 
   content::WebContents* web_contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   GURL GetTestURLFor(const std::string& host) {
@@ skipping 141 matching lines @@
   // This extension has unlimitedStorage but doesn't grant it to foo.example.com
   scoped_refptr<const Extension> extension = LoadExtensionWithCapabilities(
       MakeJSONList("http://foo.example.com/*"), MakeJSONList("clipboardRead"),
       MakeJSONList("unlimitedStorage"));
 
   EXPECT_TRUE(
       HasUnlimitedStorage(extension.get(), extension->GetResourceURL("")));
   EXPECT_FALSE(
       HasUnlimitedStorage(extension.get(), GetTestURLFor("foo.example.com")));
 }