Pass app_locale directly to AutofillTable

chrome/browser/webdata/autofill_table.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
@@ skipping 107 matching lines @@
   AutofillTable();
   virtual ~AutofillTable();
 
   // Retrieves the AutofillTable* owned by |database|.
   static AutofillTable* FromWebDatabase(WebDatabase* db);
 
   virtual WebDatabaseTable::TypeKey GetTypeKey() const OVERRIDE;
   virtual bool Init(sql::Connection* db, sql::MetaTable* meta_table) OVERRIDE;
   virtual bool IsSyncable() OVERRIDE;
   virtual bool MigrateToVersion(int version,
-                                const std::string& app_locale,
                                 bool* update_compatible_version) OVERRIDE;
 
   // Records the form elements in |elements| in the database in the
   // autofill table.  A list of all added and updated autofill entries
   // is returned in the changes out parameter.
   bool AddFormFieldValues(const std::vector<FormFieldData>& elements,
                           std::vector<AutofillChange>* changes);
 
   // Records a single form element in the database in the autofill table. A list
   // of all added and updated autofill entries is returned in the changes out
@@ skipping 152 matching lines @@
   bool ClearAutofillProfiles();
 
   // Table migration functions.
   bool MigrateToVersion23AddCardNumberEncryptedColumn();
   bool MigrateToVersion24CleanupOversizedStringFields();
   bool MigrateToVersion27UpdateLegacyCreditCards();
   bool MigrateToVersion30AddDateModifed();
   bool MigrateToVersion31AddGUIDToCreditCardsAndProfiles();
   bool MigrateToVersion32UpdateProfilesAndCreditCards();
   bool MigrateToVersion33ProfilesBasedOnFirstName();
-  bool MigrateToVersion34ProfilesBasedOnCountryCode(
-      const std::string& app_locale);
+  bool MigrateToVersion34ProfilesBasedOnCountryCode();
   bool MigrateToVersion35GreatBritainCountryCodes();
   bool MigrateToVersion37MergeAndCullOlderProfiles();
 
   // Max data length saved in the table;
   static const size_t kMaxDataLength;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_AddChanges);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_RemoveBetweenChanges);
@@ skipping 36 matching lines @@
 
   bool InitMainTable();
   bool InitCreditCardsTable();
   bool InitDatesTable();
   bool InitProfilesTable();
   bool InitProfileNamesTable();
   bool InitProfileEmailsTable();
   bool InitProfilePhonesTable();
   bool InitProfileTrashTable();
 
+  // The application locale.  The locale is needed for the migration to version
+  // 35. Since it must be read on the UI thread, it is set when the table is
+  // created (on the UI thread), and cached here so that it can be used for
+  // migrations (on the DB thread).
+  std::string app_locale_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_