Move JoinString to the base namespace

components/search_engines/keyword_table.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 "components/search_engines/keyword_table.h"
 
 #include <set>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 62 matching lines @@
     columns.push_back("search_url_post_params");
     columns.push_back("suggest_url_post_params");
     columns.push_back("instant_url_post_params");
     columns.push_back("image_url_post_params");
   }
   if (version >= 53) {
     // Column added in version 53.
     columns.push_back("new_tab_url");
   }
 
-  return JoinString(columns, std::string(concatenated ? " || " : ", "));
+  return base::JoinString(columns, std::string(concatenated ? " || " : ", "));
 }
 
 
 // Inserts the data from |data| into |s|.  |s| is assumed to have slots for all
 // the columns in the keyword table.  |id_column| is the slot number to bind
 // |data|'s |id| to; |starting_column| is the slot number of the first of a
 // contiguous set of slots to bind all the other fields to.
 void BindURLToStatement(const TemplateURLData& data,
                         sql::Statement* s,
                         int id_column,
@@ skipping 14 matching lines @@
   s->BindString(starting_column + 2, data.favicon_url.is_valid() ?
       history::URLDatabase::GURLToDatabaseURL(data.favicon_url) :
       std::string());
   s->BindString(starting_column + 3, data.url());
   s->BindBool(starting_column + 4, data.safe_for_autoreplace);
   s->BindString(starting_column + 5, data.originating_url.is_valid() ?
       history::URLDatabase::GURLToDatabaseURL(data.originating_url) :
       std::string());
   s->BindInt64(starting_column + 6, data.date_created.ToTimeT());
   s->BindInt(starting_column + 7, data.usage_count);
-  s->BindString(starting_column + 8, JoinString(data.input_encodings, ';'));
+  s->BindString(starting_column + 8,
+                base::JoinString(data.input_encodings, ";"));
   s->BindBool(starting_column + 9, data.show_in_default_list);
   s->BindString(starting_column + 10, data.suggestions_url);
   s->BindInt(starting_column + 11, data.prepopulate_id);
   s->BindBool(starting_column + 12, data.created_by_policy);
   s->BindString(starting_column + 13, data.instant_url);
   s->BindInt64(starting_column + 14, data.last_modified.ToTimeT());
   s->BindString(starting_column + 15, data.sync_guid);
   s->BindString(starting_column + 16, alternate_urls);
   s->BindString(starting_column + 17, data.search_terms_replacement_key);
   s->BindString(starting_column + 18, data.image_url);
@@ skipping 344 matching lines @@
     }
   }
 
   // Replace the old table with the new one.
   sql = "DROP TABLE " + name;
   if (!db_->Execute(sql.c_str()))
     return false;
   sql = "ALTER TABLE keywords_temp RENAME TO " + name;
   return db_->Execute(sql.c_str());
 }