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 162 matching lines @@
       return -1;
     if (values_a.size() > values_b.size())
       return 1;
     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;
+  return language_code().compare(profile.language_code());

[Ilya Sherman, 2014/04/02 23:48:11]

Hmm, it's a little strange to include the language_code here but not the origin.
 Does it make sense to potentially have a single address stored with multiple
different language codes?

[please use gerrit instead, 2014/04/08 21:33:31]

Removed.

 }
 
 bool AutofillProfile::operator==(const AutofillProfile& profile) const {
   return guid() == profile.guid() &&
          origin() == profile.origin() &&
          Compare(profile) == 0;
 }
 
 bool AutofillProfile::operator!=(const AutofillProfile& profile) const {
   return !operator==(profile);
@@ skipping 380 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