Remove application locale cache in autofill code.

components/autofill/browser/form_group.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_
 #define COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
   // Used to populate this FormGroup object with data.  Canonicalizes the data
   // according to the specified |app_locale| prior to storing, if appropriate.
   virtual bool SetInfo(AutofillFieldType type,
                        const string16& value,
                        const std::string& app_locale);
 
   // Set |field_data|'s value based on |field| and contents of |this| (using
   // data variant |variant|). It is an error to call the default implementation.
   virtual void FillFormField(const AutofillField& field,
                              size_t variant,
+                             const std::string& app_locale,
                              FormFieldData* field_data) const;
 
   // Fills in select control with data matching |type| from |this|.
   // Public for testing purposes.
   void FillSelectControl(AutofillFieldType type,
+                         const std::string& app_locale,
                          FormFieldData* field_data) const;
 
   // Returns true if |value| is a valid US state name or abbreviation.  It is
   // case insensitive.  Valid for US states only.
   // TODO(estade): this is a crappy place for this function.
   static bool IsValidState(const string16& value);
 
  protected:
   // AutofillProfile needs to call into GetSupportedTypes() for objects of
   // non-AutofillProfile type, for which mere inheritance is insufficient.
   friend class AutofillProfile;
 
   // Returns a set of AutofillFieldTypes for which this FormGroup can store
   // data.  This method is additive on |supported_types|.
   virtual void GetSupportedTypes(FieldTypeSet* supported_types) const = 0;
 
   // Fills in a select control for a country from data in |this|. Returns true
   // for success.
-  virtual bool FillCountrySelectControl(FormFieldData* field_data) const;
+  virtual bool FillCountrySelectControl(const std::string& app_locale,
+                                        FormFieldData* field_data) const;
 };
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_FORM_GROUP_H_