Revert of Move JoinString to the base namespace

sql/recovery.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 "sql/recovery.h"
 
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 438 matching lines @@
   // execute in case of conflicts.
   for (size_t i = 0; i < extend_columns; ++i) {
     create_column_decls.push_back(
         base::StringPrintf("ignore%" PRIuS " ANY", i));
   }
 
   std::string recover_create(base::StringPrintf(
       "CREATE VIRTUAL TABLE temp.recover_%s USING recover(corrupt.%s, %s)",
       table_name,
       table_name,
-      base::JoinString(create_column_decls, ",").c_str()));
+      JoinString(create_column_decls, ',').c_str()));
 
   std::string recover_insert(base::StringPrintf(
       "INSERT OR REPLACE INTO main.%s SELECT %s FROM temp.recover_%s",
       table_name,
-      base::JoinString(insert_columns, ",").c_str(),
+      JoinString(insert_columns, ',').c_str(),
       table_name));
 
   std::string recover_drop(base::StringPrintf(
       "DROP TABLE temp.recover_%s", table_name));
 
   if (!db()->Execute(recover_create.c_str())) {
     RecordRecoveryEvent(RECOVERY_FAILED_AUTORECOVER_CREATE);
     return false;
   }
 
@@ skipping 47 matching lines @@
     }
     return false;
   }
 
   RecordRecoveryEvent(RECOVERY_SUCCESS_META_VERSION);
   *version = recovery_version.ColumnInt(0);
   return true;
 }
 
 }  // namespace sql