Pass app_locale directly to AutofillTable

chrome/browser/webdata/web_database.cc

 // Copyright (c) 2012 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/webdata/web_database.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 51 matching lines @@
 }
 
 void WebDatabase::CommitTransaction() {
   db_.CommitTransaction();
 }
 
 sql::Connection* WebDatabase::GetSQLConnection() {
   return &db_;
 }
 
-sql::InitStatus WebDatabase::Init(const base::FilePath& db_name,
-                                  const std::string& app_locale) {
+sql::InitStatus WebDatabase::Init(const base::FilePath& db_name) {
   // When running in unit tests, there is already a NotificationService object.
   // Since only one can exist at a time per thread, check first.
   if (!content::NotificationService::current())
     notification_service_.reset(content::NotificationService::Create());
 
   db_.set_error_histogram_name("Sqlite.Web.Error");
 
   // We don't store that much data in the tables so use a small page size.
   // This provides a large benefit for empty tables (which is very likely with
   // the tables we create).
@@ skipping 29 matching lines @@
        ++it) {
     if (!it->second->Init(&db_, &meta_table_)) {
       LOG(WARNING) << "Unable to initialize the web database.";
       return sql::INIT_FAILURE;
     }
   }
 
   // If the file on disk is an older database version, bring it up to date.
   // If the migration fails we return an error to caller and do not commit
   // the migration.
-  sql::InitStatus migration_status = MigrateOldVersionsAsNeeded(app_locale);
+  sql::InitStatus migration_status = MigrateOldVersionsAsNeeded();
   if (migration_status != sql::INIT_OK)
     return migration_status;
 
   return transaction.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
 }
 
-sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded(
-    const std::string& app_locale) {
+sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
   // Some malware used to lower the version number, causing migration to
   // fail. Ensure the version number is at least as high as the compatible
   // version number.
   int current_version = std::max(meta_table_.GetVersionNumber(),
                                  meta_table_.GetCompatibleVersionNumber());
   if (current_version > meta_table_.GetVersionNumber())
     ChangeVersion(&meta_table_, current_version, false);
 
   if (current_version < 20) {
     // Versions 1 - 19 are unhandled.  Version numbers greater than
@@ skipping 15 matching lines @@
   for (int next_version = current_version + 1;
        next_version <= kCurrentVersionNumber;
        ++next_version) {
     // Give each table a chance to migrate to this version.
     for (TableMap::iterator it = tables_.begin();
          it != tables_.end();
          ++it) {
       // Any of the tables may set this to true, but by default it is false.
       bool update_compatible_version = false;
       if (!it->second->MigrateToVersion(next_version,
-                                           app_locale,
-                                           &update_compatible_version)) {
+                                        &update_compatible_version)) {
         return FailedMigrationTo(next_version);
       }
 
       ChangeVersion(&meta_table_, next_version, update_compatible_version);
     }
   }
   return sql::INIT_OK;
 }