Store the language code for the address in autofill profile.

components/autofill/core/browser/autofill_profile.cc

 // 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.
 
 #include "components/autofill/core/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 244 matching lines @@
 
   name_ = profile.name_;
   email_ = profile.email_;
   company_ = profile.company_;
   phone_number_ = profile.phone_number_;
 
   for (size_t i = 0; i < phone_number_.size(); ++i)
     phone_number_[i].set_profile(this);
 
   address_ = profile.address_;
+  set_language_code(profile.language_code());
 
   return *this;
 }
 
 void AutofillProfile::GetMatchingTypes(
     const base::string16& text,
     const std::string& app_locale,
     ServerFieldTypeSet* matching_types) const {
   FormGroupList info = FormGroups();
   for (FormGroupList::const_iterator it = info.begin(); it != info.end(); ++it)
@@ skipping 119 matching lines @@
 
     case EMAIL_ADDRESS:
       return !autofill::IsValidEmailAddress(data);
 
     default:
       NOTREACHED();
       return false;
   }
 }
 
-
 int AutofillProfile::Compare(const AutofillProfile& profile) const {
   const ServerFieldType single_value_types[] = {
     COMPANY_NAME,
     ADDRESS_HOME_LINE1,
     ADDRESS_HOME_LINE2,
     ADDRESS_HOME_DEPENDENT_LOCALITY,
     ADDRESS_HOME_CITY,
     ADDRESS_HOME_STATE,
     ADDRESS_HOME_ZIP,
     ADDRESS_HOME_SORTING_CODE,
@@ skipping 25 matching lines @@
     for (size_t j = 0; j < values_a.size(); ++j) {
       int comparison = values_a[j].compare(values_b[j]);
       if (comparison != 0)
         return comparison;
     }
   }
 
   return 0;
 }
 
+bool AutofillProfile::EqualsSansOrigin(const AutofillProfile& profile) const {
+  return guid() == profile.guid() &&
+         language_code() == profile.language_code() &&
+         Compare(profile) == 0;
+}
+
+bool AutofillProfile::EqualsSansGuid(const AutofillProfile& profile) const {
+  return origin() == profile.origin() &&
+         language_code() == profile.language_code() &&
+         Compare(profile) == 0;
+}
+
 bool AutofillProfile::operator==(const AutofillProfile& profile) const {
   return guid() == profile.guid() &&
-         origin() == profile.origin() &&
-         Compare(profile) == 0;
+         EqualsSansGuid(profile);

[Ilya Sherman, 2014/04/09 23:58:31]

nit: Looks like this fits on a single line now?

[please use gerrit instead, 2014/04/10 00:14:23]

Done.

 }
 
 bool AutofillProfile::operator!=(const AutofillProfile& profile) const {
   return !operator==(profile);
 }
 
 const base::string16 AutofillProfile::PrimaryValue() const {
   return GetRawInfo(ADDRESS_HOME_LINE1) + GetRawInfo(ADDRESS_HOME_CITY);
 }
 
@@ skipping 29 matching lines @@
   }
 
   return true;
 }
 
 void AutofillProfile::OverwriteWithOrAddTo(const AutofillProfile& profile,
                                            const std::string& app_locale) {
   // Verified profiles should never be overwritten with unverified data.
   DCHECK(!IsVerified() || profile.IsVerified());
   set_origin(profile.origin());
+  set_language_code(profile.language_code());
 
   ServerFieldTypeSet field_types;
   profile.GetNonEmptyTypes(app_locale, &field_types);
 
   // Only transfer "full" types (e.g. full name) and not fragments (e.g.
   // first name, last name).
   CollapseCompoundFieldTypes(&field_types);
 
   // TODO(isherman): Revisit this decision in the context of i18n and storing
   // full addresses rather than storing 1-to-2 lines of an address.
@@ skipping 325 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
+      << profile.language_code()
+      << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill