Pass app_locale directly to AutofillTable

chrome/browser/webdata/autofill_table.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/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 313 matching lines @@
 
 WebDatabaseTable::TypeKey GetKey() {
   return reinterpret_cast<void*>(&table_key);
 }
 
 }  // namespace
 
 // The maximum length allowed for form data.
 const size_t AutofillTable::kMaxDataLength = 1024;
 
-AutofillTable::AutofillTable() {
+AutofillTable::AutofillTable()
+    : app_locale_(AutofillCountry::ApplicationLocale()) {
 }
 
 AutofillTable::~AutofillTable() {
 }
 
 AutofillTable* AutofillTable::FromWebDatabase(WebDatabase* db) {
   return static_cast<AutofillTable*>(db->GetTable(GetKey()));
 }
 
 WebDatabaseTable::TypeKey AutofillTable::GetTypeKey() const {
   return GetKey();
 }
 
 bool AutofillTable::Init(sql::Connection* db, sql::MetaTable* meta_table) {
   WebDatabaseTable::Init(db, meta_table);
   return (InitMainTable() && InitCreditCardsTable() && InitDatesTable() &&
           InitProfilesTable() && InitProfileNamesTable() &&
           InitProfileEmailsTable() && InitProfilePhonesTable() &&
           InitProfileTrashTable());
 }
 
 bool AutofillTable::IsSyncable() {
   return true;
 }
 
 bool AutofillTable::MigrateToVersion(int version,
-                                     const std::string& app_locale,
                                      bool* update_compatible_version) {
   // Migrate if necessary.
   switch (version) {
     case 22:
       return ClearAutofillEmptyValueElements();
     case 23:
       return MigrateToVersion23AddCardNumberEncryptedColumn();
     case 24:
       return MigrateToVersion24CleanupOversizedStringFields();
     case 27:
       *update_compatible_version = true;
       return MigrateToVersion27UpdateLegacyCreditCards();
     case 30:
       *update_compatible_version = true;
       return MigrateToVersion30AddDateModifed();
     case 31:
       *update_compatible_version = true;
       return MigrateToVersion31AddGUIDToCreditCardsAndProfiles();
     case 32:
       *update_compatible_version = true;
       return MigrateToVersion32UpdateProfilesAndCreditCards();
     case 33:
       *update_compatible_version = true;
       return MigrateToVersion33ProfilesBasedOnFirstName();
     case 34:
       *update_compatible_version = true;
-      return MigrateToVersion34ProfilesBasedOnCountryCode(app_locale);
+      return MigrateToVersion34ProfilesBasedOnCountryCode();
     case 35:
       *update_compatible_version = true;
       return MigrateToVersion35GreatBritainCountryCodes();
     // Combine migrations 36 and 37.  This is due to enhancements to the merge
     // step when migrating profiles.  The original migration from 35 to 36 did
     // not merge profiles with identical addresses, but the migration from 36 to
     // 37 does.  The step from 35 to 36 should only happen on the Chrome 12 dev
     // channel.  Chrome 12 beta and release users will jump from 35 to 37
     // directly getting the full benefits of the multi-valued merge as well as
     // the culling of bad data.
@@ skipping 1521 matching lines @@
       return false;
   }
 
   return true;
 }
 
 // Test the existence of the |country_code| column as an indication that
 // we need a migration.  It is possible that the new |autofill_profiles|
 // schema is in place because the table was newly created when migrating
 // from a pre-version-22 database.
-bool AutofillTable::MigrateToVersion34ProfilesBasedOnCountryCode(
-    const std::string& app_locale) {
+bool AutofillTable::MigrateToVersion34ProfilesBasedOnCountryCode() {
   if (!db_->DoesColumnExist("autofill_profiles", "country_code")) {
     if (!db_->Execute("ALTER TABLE autofill_profiles ADD COLUMN "
                       "country_code VARCHAR")) {
       return false;
     }
 
     // Set all the |country_code| fields to match existing |country| values.
     sql::Statement s(db_->GetUniqueStatement("SELECT guid, country "
                                              "FROM autofill_profiles"));
 
     while (s.Step()) {
       sql::Statement update_s(
           db_->GetUniqueStatement("UPDATE autofill_profiles "
                                   "SET country_code=? WHERE guid=?"));
 
       string16 country = s.ColumnString16(1);
       update_s.BindString(0, AutofillCountry::GetCountryCode(country,
-                                                             app_locale));
+                                                             app_locale_));
       update_s.BindString(1, s.ColumnString(0));
 
       if (!update_s.Run())
         return false;
     }
     if (!s.Succeeded())
       return false;
   }
 
   return true;
@@ skipping 79 matching lines @@
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
 
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }