Remove application locale cache in autofill code.

components/autofill/browser/autofill_profile.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 COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
@@ skipping 34 matching lines @@
   virtual string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
   virtual void SetRawInfo(AutofillFieldType type,
                           const string16& value) OVERRIDE;
   virtual string16 GetInfo(AutofillFieldType type,
                            const std::string& app_locale) const OVERRIDE;
   virtual bool SetInfo(AutofillFieldType type,
                        const string16& value,
                        const std::string& app_locale) OVERRIDE;
   virtual void FillFormField(const AutofillField& field,
                              size_t variant,
+                             const std::string& app_locale,
                              FormFieldData* field_data) const OVERRIDE;
 
   // Multi-value equivalents to |GetInfo| and |SetInfo|.
   void SetRawMultiInfo(AutofillFieldType type,
                        const std::vector<string16>& values);
   void GetRawMultiInfo(AutofillFieldType type,
                        std::vector<string16>* values) const;
   void GetMultiInfo(AutofillFieldType type,
                     const std::string& app_locale,
                     std::vector<string16>* values) const;
 
   // Set |field_data|'s value for phone number based on contents of |this|.
   // The |field| specifies the type of the phone and whether this is a
   // phone prefix or suffix.  The |variant| parameter specifies which value in a
   // multi-valued profile.
   void FillPhoneNumberField(const AutofillField& field,
                             size_t variant,
+                            const std::string& app_locale,
                             FormFieldData* field_data) const;
 
   // The user-visible label of the profile, generated in relation to other
   // profiles. Shows at least 2 fields that differentiate profile from other
   // profiles. See AdjustInferredLabels() further down for more description.
   const string16 Label() const;
 
   // This guid is the primary identifier for |AutofillProfile| objects.
   // TODO(estade): remove this and just use GetGUID(). |guid_| can probably
   // be moved to FormGroup.
   const std::string guid() const { return guid_; }
   void set_guid(const std::string& guid) { guid_ = guid; }
 
   // Accessors for the stored address's country code.
   const std::string CountryCode() const;
   void SetCountryCode(const std::string& country_code);
 
   // Returns true if there are no values (field types) set.
-  bool IsEmpty() const;
+  bool IsEmpty(const std::string& app_locale) const;
 
   // Comparison for Sync.  Returns 0 if the profile is the same as |this|,
   // or < 0, or > 0 if it is different.  The implied ordering can be used for
   // culling duplicates.  The ordering is based on collation order of the
   // textual contents of the fields.
   // GUIDs are not compared, only the values of the contents themselves.
   // Full profile comparision, comparison includes multi-valued fields.
   int Compare(const AutofillProfile& profile) const;
 
   // Equality operators compare GUIDs and the contents in the comparison.
   bool operator==(const AutofillProfile& profile) const;
   virtual bool operator!=(const AutofillProfile& profile) const;
 
   // Returns concatenation of full name and address line 1.  This acts as the
   // basis of comparison for new values that are submitted through forms to
   // aid with correct aggregation of new data.
   const string16 PrimaryValue() const;
 
   // Returns true if the data in this AutofillProfile is a subset of the data in
   // |profile|.
-  bool IsSubsetOf(const AutofillProfile& profile) const;
+  bool IsSubsetOf(const AutofillProfile& profile,
+                  const std::string& app_locale) const;
 
   // Overwrites the single-valued field data in |profile| with this
   // Profile.  Or, for multi-valued fields append the new values.
-  void OverwriteWithOrAddTo(const AutofillProfile& profile);
+  void OverwriteWithOrAddTo(const AutofillProfile& profile,
+                            const std::string& app_locale);
 
   // Returns |true| if |type| accepts multi-values.
   static bool SupportsMultiValue(AutofillFieldType type);
 
   // Adjusts the labels according to profile data.
   // Labels contain minimal different combination of:
   // 1. Full name.
   // 2. Address.
   // 3. E-mail.
   // 4. Phone.
@@ skipping 16 matching lines @@
       const std::vector<AutofillProfile*>* profiles,
       const std::vector<AutofillFieldType>* suggested_fields,
       AutofillFieldType excluded_field,
       size_t minimal_fields_shown,
       std::vector<string16>* created_labels);
 
  private:
   typedef std::vector<const FormGroup*> FormGroupList;
 
   // FormGroup:
-  virtual bool FillCountrySelectControl(FormFieldData* field) const OVERRIDE;
+  virtual bool FillCountrySelectControl(const std::string& app_locale,
+                                        FormFieldData* field) const OVERRIDE;
   virtual void GetSupportedTypes(FieldTypeSet* supported_types) const OVERRIDE;
 
   // Shared implementation for GetRawMultiInfo() and GetMultiInfo().  Pass an
   // empty |app_locale| to get the raw info; otherwise, the returned info is
   // canonicalized according to the given |app_locale|, if appropriate.
   void GetMultiInfoImpl(AutofillFieldType type,
                         const std::string& app_locale,
                         std::vector<string16>* values) const;
 
   // Checks if the |phone| is in the |existing_phones| using fuzzy matching:
   // for example, "1-800-FLOWERS", "18003569377", "(800)356-9377" and "356-9377"
   // are considered the same.
   // Adds the |phone| to the |existing_phones| if not already there.
   void AddPhoneIfUnique(const string16& phone,
+                        const std::string& app_locale,
                         std::vector<string16>* existing_phones);
 
   // Builds inferred label from the first |num_fields_to_include| non-empty
   // fields in |label_fields|. Uses as many fields as possible if there are not
   // enough non-empty fields.
   string16 ConstructInferredLabel(
       const std::vector<AutofillFieldType>& label_fields,
       size_t num_fields_to_include) const;
 
   // Creates inferred labels for |profiles| at indices corresponding to
@@ skipping 25 matching lines @@
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<PhoneNumber> home_number_;
   Address address_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_