Make autofill's Address store country using the country code so that app locale isn't needed for th…

components/autofill/browser/autofill_profile.cc

 // 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.
 
 #include "components/autofill/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 382 matching lines @@
     }
   }
 
   field_data->value = number;
 }
 
 const string16 AutofillProfile::Label() const {
   return label_;
 }
 
-const std::string AutofillProfile::CountryCode() const {
-  return address_.country_code();
-}
-
-void AutofillProfile::SetCountryCode(const std::string& country_code) {
-  address_.set_country_code(country_code);
-}
-
 bool AutofillProfile::IsEmpty() const {
   FieldTypeSet types;
   GetNonEmptyTypes(AutofillCountry::ApplicationLocale(), &types);
   return types.empty();
 }
 
 int AutofillProfile::Compare(const AutofillProfile& profile) const {
   const AutofillFieldType single_value_types[] = { COMPANY_NAME,
                                                    ADDRESS_HOME_LINE1,
                                                    ADDRESS_HOME_LINE2,
@@ skipping 55 matching lines @@
     if (*iter == NAME_FULL) {
       // Ignore the compound "full name" field type.  We are only interested in
       // comparing the constituent parts.  For example, if |this| has a middle
       // name saved, but |profile| lacks one, |profile| could still be a subset
       // of |this|.
       continue;
     } else if (AutofillType(*iter).group() == AutofillType::PHONE) {
       // Phone numbers should be canonicalized prior to being compared.
       if (*iter != PHONE_HOME_WHOLE_NUMBER) {
         continue;
-      } else if (!autofill_i18n::PhoneNumbersMatch(GetRawInfo(*iter),
-                                                   profile.GetRawInfo(*iter),
-                                                   CountryCode())) {
+      } else if (!autofill_i18n::PhoneNumbersMatch(
+            GetRawInfo(*iter),
+            profile.GetRawInfo(*iter),
+            UTF16ToASCII(GetRawInfo(ADDRESS_HOME_COUNTRY)))) {
         return false;
       }
     } else if (StringToLowerASCII(GetRawInfo(*iter)) !=
                    StringToLowerASCII(profile.GetRawInfo(*iter))) {
       return false;
     }
   }
 
   return true;
 }
@@ skipping 116 matching lines @@
 }
 
 void AutofillProfile::GetSupportedTypes(FieldTypeSet* supported_types) const {
   FormGroupList info = FormGroups();
   for (FormGroupList::const_iterator it = info.begin(); it != info.end(); ++it)
     (*it)->GetSupportedTypes(supported_types);
 }
 
 bool AutofillProfile::FillCountrySelectControl(FormFieldData* field_data)
     const {
-  std::string country_code = CountryCode();
+  std::string country_code = UTF16ToASCII(GetRawInfo(ADDRESS_HOME_COUNTRY));
   std::string app_locale = AutofillCountry::ApplicationLocale();
 
   DCHECK_EQ(field_data->option_values.size(),
             field_data->option_contents.size());
   for (size_t i = 0; i < field_data->option_values.size(); ++i) {
     // Canonicalize each <option> value to a country code, and compare to the
     // target country code.
     string16 value = field_data->option_values[i];
     string16 contents = field_data->option_contents[i];
     if (country_code == AutofillCountry::GetCountryCode(value, app_locale) ||
@@ skipping 23 matching lines @@
       values->resize(1);
       (*values)[0] = GetFormGroupInfo(*this, type, app_locale);
   }
 }
 
 void AutofillProfile::AddPhoneIfUnique(const string16& phone,
                                        std::vector<string16>* existing_phones) {
   DCHECK(existing_phones);
   // Phones allow "fuzzy" matching, so "1-800-FLOWERS", "18003569377",
   // "(800)356-9377" and "356-9377" are considered the same.
-  if (std::find_if(existing_phones->begin(), existing_phones->end(),
-                   FindByPhone(phone, CountryCode())) ==
+  if (std::find_if(
+          existing_phones->begin(), existing_phones->end(),
+          FindByPhone(phone, UTF16ToASCII(GetRawInfo(ADDRESS_HOME_COUNTRY)))) ==
       existing_phones->end()) {
     existing_phones->push_back(phone);
   }
 }
 
 string16 AutofillProfile::ConstructInferredLabel(
     const std::vector<AutofillFieldType>& included_fields,
     size_t num_fields_to_use) const {
   const string16 separator =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR);
@@ skipping 158 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_COUNTRY))
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }