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

components/autofill/browser/personal_data_manager.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/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 69 matching lines @@
 // Returns true if minimum requirements for import of a given |profile| have
 // been met.  An address submitted via a form must have at least the fields
 // required as determined by its country code.
 // No verification of validity of the contents is preformed. This is an
 // existence check only.
 bool IsMinimumAddress(const AutofillProfile& profile) {
   // All countries require at least one address line.
   if (profile.GetRawInfo(ADDRESS_HOME_LINE1).empty())
     return false;
   std::string app_locale = AutofillCountry::ApplicationLocale();
-  std::string country_code = profile.CountryCode();
+  std::string country_code =
+      UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY));
 
   if (country_code.empty())
     country_code = AutofillCountry::CountryCodeForLocale(app_locale);
 
   AutofillCountry country(country_code, app_locale);
 
   if (country.requires_city() && profile.GetRawInfo(ADDRESS_HOME_CITY).empty())
     return false;
 
   if (country.requires_state() &&
@@ skipping 170 matching lines @@
     } else {
       // We need to store phone data in the variables, before building the whole
       // number at the end. The rest of the fields are set "as is".
       // If the fields are not the phone fields in question home.SetInfo() is
       // going to return false.
       if (!home.SetInfo(field_type, value))
         imported_profile->SetInfo(field_type, value, app_locale);
 
       // Reject profiles with invalid country information.
       if (field_type == ADDRESS_HOME_COUNTRY &&
-          !value.empty() && imported_profile->CountryCode().empty()) {
+          !value.empty() &&
+          imported_profile->GetRawInfo(ADDRESS_HOME_COUNTRY).empty()) {
         imported_profile.reset();
         break;
       }
     }
   }
 
   // Construct the phone number. Reject the profile if the number is invalid.
   if (imported_profile.get() && !home.IsEmpty()) {
     string16 constructed_number;
     if (!home.ParseNumber(*imported_profile, app_locale, &constructed_number) ||
@@ skipping 368 matching lines @@
     const AutofillProfile& profile) {
   if (!IsMinimumAddress(profile))
     return false;
 
   string16 email = profile.GetRawInfo(EMAIL_ADDRESS);
   if (!email.empty() && !autofill::IsValidEmailAddress(email))
     return false;
 
   // Reject profiles with invalid US state information.
   string16 state = profile.GetRawInfo(ADDRESS_HOME_STATE);
-  if (profile.CountryCode() == "US" &&
+  if (UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) == "US" &&

[Ilya Sherman, 2013/04/05 05:18:01]

nit: It's more typical to convert the "US" constant using ASCIIToUTF16().

[jam, 2013/04/05 06:45:54]

Done.

       !state.empty() && !FormGroup::IsValidState(state)) {
     return false;
   }
 
   // Reject profiles with invalid US zip information.
   string16 zip = profile.GetRawInfo(ADDRESS_HOME_ZIP);
-  if (profile.CountryCode() == "US" && !zip.empty() &&
-      !autofill::IsValidZip(zip))
+  if (UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) == "US" &&

[Ilya Sherman, 2013/04/05 05:18:01]

Ditto.

[jam, 2013/04/05 06:45:54]

Done.

+      !zip.empty() && !autofill::IsValidZip(zip))
     return false;
 
   return true;
 }
 
 // static
 bool PersonalDataManager::MergeProfile(
     const AutofillProfile& profile,
     const std::vector<AutofillProfile*>& existing_profiles,
     std::vector<AutofillProfile>* merged_profiles) {
@@ skipping 287 matching lines @@
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }