Remove application locale cache in autofill code.

components/autofill/browser/form_group.cc

 // Copyright (c) 2011 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/autofill/browser/form_group.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/basictypes.h"
@@ skipping 240 matching lines @@
 
 bool FormGroup::SetInfo(AutofillFieldType type,
                         const string16& value,
                         const std::string& app_locale) {
   SetRawInfo(type, value);
   return true;
 }
 
 void FormGroup::FillFormField(const AutofillField& field,
                               size_t variant,
+                              const std::string& app_locale,
                               FormFieldData* field_data) const {
   NOTREACHED();
 }
 
 void FormGroup::FillSelectControl(AutofillFieldType type,
+                                  const std::string& app_locale,
                                   FormFieldData* field) const {
   DCHECK(field);
   DCHECK_EQ("select-one", field->form_control_type);
   DCHECK_EQ(field->option_values.size(), field->option_contents.size());
 
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   string16 field_text = GetInfo(type, app_locale);
   string16 field_text_lower = StringToLowerASCII(field_text);
   if (field_text.empty())
     return;
 
   string16 value;
   for (size_t i = 0; i < field->option_values.size(); ++i) {
     if (field_text == field->option_values[i] ||
         field_text == field->option_contents[i]) {
       // An exact match, use it.
@@ skipping 10 matching lines @@
   }
 
   if (!value.empty()) {
     field->value = value;
     return;
   }
 
   if (type == ADDRESS_HOME_STATE || type == ADDRESS_BILLING_STATE) {
     FillStateSelectControl(field_text, field);
   } else if (type == ADDRESS_HOME_COUNTRY || type == ADDRESS_BILLING_COUNTRY) {
-    FillCountrySelectControl(field);
+    FillCountrySelectControl(app_locale, field);
   } else if (type == CREDIT_CARD_EXP_MONTH) {
     FillExpirationMonthSelectControl(field_text, field);
   } else if (type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
     // Attempt to fill the year as a 2-digit year.  This compensates for the
     // fact that our heuristics do not always correctly detect when a website
     // requests a 2-digit rather than a 4-digit year.
-    FillSelectControl(CREDIT_CARD_EXP_2_DIGIT_YEAR, field);
+    FillSelectControl(CREDIT_CARD_EXP_2_DIGIT_YEAR, app_locale, field);
   } else if (type == CREDIT_CARD_TYPE) {
     FillCreditCardTypeSelectControl(field_text, field);
   }
 }
 
-bool FormGroup::FillCountrySelectControl(FormFieldData* field_data) const {
+bool FormGroup::FillCountrySelectControl(const std::string& app_locale,
+                                         FormFieldData* field_data) const {
   return false;
 }
 
 // static
 bool FormGroup::IsValidState(const string16& value) {
   return !State::Abbreviation(value).empty() || !State::FullName(value).empty();
 }