Revert of Move JoinString to the base namespace

chrome/browser/sxs_linux.cc

 // Copyright 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/browser/sxs_linux.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 63 matching lines @@
   if (std::find(user_data_dir_channels.begin(),
                 user_data_dir_channels.end(),
                 product_channel_name) != user_data_dir_channels.end()) {
     // No need to do further disk writes if our channel mark is already present.
     return true;
   }
 
   user_data_dir_channels.push_back(product_channel_name);
   return base::ImportantFileWriter::WriteFileAtomically(
       channels_path,
-      base::JoinString(user_data_dir_channels, "\n"));
+      JoinString(user_data_dir_channels, "\n"));
 }
 
 }  // namespace
 
 namespace sxs_linux {
 
 void AddChannelMarkToUserDataDir() {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   base::FilePath user_data_dir;
   if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
@@ skipping 53 matching lines @@
   if (!base::Move(source_path, target_path)) {
     LOG(ERROR) << "Failed to rename '" << source_path.value()
                << "' to '" << target_path.value() << "'";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 }  // namespace sxs_linux