Store the language code for the address in autofill profile.

components/autofill/core/browser/autofill_profile.h

 // Copyright 2013 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_CORE_BROWSER_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
@@ skipping 60 matching lines @@
   // Returns true if there are no values (field types) set.
   bool IsEmpty(const std::string& app_locale) const;
 
   // Returns true if the |type| of data in this profile is present, but invalid.
   // Otherwise returns false.
   bool IsPresentButInvalid(ServerFieldType type) 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 and origins are not compared, only the values of the contents
-  // themselves.  Full profile comparision, comparison includes multi-valued
-  // fields.
+  // textual contents of the fields. Full profile comparison, comparison
+  // includes multi-valued fields.
+  //
+  // GUIDs, origins, and language codes are not compared, only the contents
+  // themselves.
   int Compare(const AutofillProfile& profile) const;
 
-  // Equality operators compare GUIDs, origins, and the contents in the
-  // comparison.
+  // Same as operator==, but ignores differences in origin.
+  bool EqualsSansOrigin(const AutofillProfile& profile) const;
+
+  // Same as operator==, but ignores differences in GUID.
+  bool EqualsSansGuid(const AutofillProfile& profile) const;
+
+  // Equality operators compare GUIDs, origins, language code, 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 base::string16 PrimaryValue() const;
 
   // Returns true if the data in this AutofillProfile is a subset of the data in
   // |profile|.
@@ skipping 26 matching lines @@
   // and |excluded_field| is ignored; by convention, it should be of
   // |UNKNOWN_TYPE| when |suggested_fields| is NULL. Each label includes at
   // least |minimal_fields_shown| fields, if possible.
   static void CreateInferredLabels(
       const std::vector<AutofillProfile*>& profiles,
       const std::vector<ServerFieldType>* suggested_fields,
       ServerFieldType excluded_field,
       size_t minimal_fields_shown,
       std::vector<base::string16>* labels);
 
+  const std::string& language_code() const { return language_code_; }
+  void set_language_code(const std::string& language_code) {
+    language_code_ = language_code;
+  }
+
  private:
   typedef std::vector<const FormGroup*> FormGroupList;
 
   // FormGroup:
   virtual void GetSupportedTypes(
       ServerFieldTypeSet* 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.
@@ skipping 33 matching lines @@
   FormGroupList FormGroups() const;
   const FormGroup* FormGroupForType(const AutofillType& type) const;
   FormGroup* MutableFormGroupForType(const AutofillType& type);
 
   // Personal information for this profile.
   std::vector<NameInfo> name_;
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<PhoneNumber> phone_number_;
   Address address_;
+
+  // The BCP 47 language code that can be used to format |address_| for display.
+  std::string language_code_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_H_