Revert of Move JoinString to the base namespace

chrome/test/chromedriver/chrome_launcher.cc

 // Copyright (c) 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/test/chromedriver/chrome_launcher.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 731 matching lines @@
       return status;
     if (switches->HasSwitch("disable-extensions")) {
       UpdateExtensionSwitch(switches, "load-component-extension",
                             automation_extension.value());
     } else {
       extension_paths.push_back(automation_extension.value());
     }
   }
 
   if (extension_paths.size()) {
-    base::FilePath::StringType extension_paths_value = base::JoinString(
-        extension_paths, base::FilePath::StringType(1, ','));
+    base::FilePath::StringType extension_paths_value = JoinString(
+        extension_paths, FILE_PATH_LITERAL(','));
     UpdateExtensionSwitch(switches, "load-extension", extension_paths_value);
   }
   bg_pages->swap(bg_pages_tmp);
   return Status(kOk);
 }
 
 Status WritePrefsFile(
     const std::string& template_string,
     const base::DictionaryValue* custom_prefs,
     const base::FilePath& path) {
@@ skipping 69 matching lines @@
   // Write empty "First Run" file, otherwise Chrome will wipe the default
   // profile that was written.
   if (base::WriteFile(
           user_data_dir.Append(chrome::kFirstRunSentinel), "", 0) != 0) {
     return Status(kUnknownError, "failed to write first run file");
   }
   return Status(kOk);
 }
 
 }  // namespace internal