Remove application locale cache in autofill code.

components/webdata/autofill/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 "components/webdata/autofill/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 315 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()
-    : app_locale_(AutofillCountry::ApplicationLocale()) {
+AutofillTable::AutofillTable(const std::string& app_locale)
+    : app_locale_(app_locale) {
 }
 
 AutofillTable::~AutofillTable() {
 }
 
 AutofillTable* AutofillTable::FromWebDatabase(WebDatabase* db) {
   return static_cast<AutofillTable*>(db->GetTable(GetKey()));
 }
 
 WebDatabaseTable::TypeKey AutofillTable::GetTypeKey() const {
@@ skipping 1636 matching lines @@
     std::string guid = s.ColumnString(0);
     int64 date_modified = s.ColumnInt64(1);
     modification_map.insert(
         std::pair<std::string, int64>(guid, date_modified));
     AutofillProfile* profile = NULL;
     if (!GetAutofillProfile(guid, &profile))
       return false;
 
     scoped_ptr<AutofillProfile> p(profile);
 
-    if (PersonalDataManager::IsValidLearnableProfile(*p)) {
+    if (PersonalDataManager::IsValidLearnableProfile(*p, app_locale_)) {
       std::vector<AutofillProfile> merged_profiles;
       bool merged = PersonalDataManager::MergeProfile(
-          *p, accumulated_profiles_p, &merged_profiles);
+          *p, accumulated_profiles_p, app_locale_, &merged_profiles);
 
       std::swap(accumulated_profiles, merged_profiles);
 
       accumulated_profiles_p.clear();
       accumulated_profiles_p.resize(accumulated_profiles.size());
       std::transform(accumulated_profiles.begin(),
                      accumulated_profiles.end(),
                      accumulated_profiles_p.begin(),
                      address_of<AutofillProfile>);
 
@@ skipping 32 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;
 }