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

components/autofill/browser/android/auxiliary_profiles_android.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.
 
 // Populates default autofill profile from user's own Android contact.
 #include "components/autofill/browser/android/auxiliary_profiles_android.h"
 
 #include <vector>
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
+#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/phone_number.h"
 
 // Generates the autofill profile by accessing the Android
 // ContactsContract.Profile API through PersonalAutofillPopulator via JNI.
 // The generated profile corresponds to the user's "ME" contact in the
 // "People" app. The caller passes a vector of profiles into the constructor
 // then initiates a fetch using |GetContactsProfile()| method. This clears
 // any existing addresses.
 
@@ skipping 14 matching lines @@
     accumulator.push_back(neighborhood);
 
   return JoinString(accumulator, ASCIIToUTF16(", "));
 }
 
 }  // namespace
 
 namespace autofill {
 
 AuxiliaryProfilesAndroid::AuxiliaryProfilesAndroid(
-    const AuxiliaryProfileLoaderAndroid& profileLoader)
-    : profile_loader_(profileLoader) {}
+    const AuxiliaryProfileLoaderAndroid& profileLoader,
+    const std::string& app_locale)
+    : profile_loader_(profileLoader),
+      app_locale_(app_locale) {}
 
 AuxiliaryProfilesAndroid::~AuxiliaryProfilesAndroid() {
 }
 
 scoped_ptr<AutofillProfile> AuxiliaryProfilesAndroid::LoadContactsProfile() {
   scoped_ptr<AutofillProfile> profile(new AutofillProfile(kAndroidMeContactA));
   LoadName(profile.get());
   LoadEmailAddress(profile.get());
   LoadPhoneNumbers(profile.get());
 
   // Android user's profile contact does not parse its address
   // into constituent parts. Instead we just get a long string blob.
   // Disable address population until we implement a way to parse the
   // data.
   // http://crbug.com/178838
   // LoadAddress(profile.get());
 
   return profile.Pass();
 }
 
 void AuxiliaryProfilesAndroid::LoadAddress(AutofillProfile* profile) {
   string16 street = profile_loader_.GetStreet();
   string16 post_office_box = profile_loader_.GetPostOfficeBox();
   string16 neighborhood = profile_loader_.GetNeighborhood();
   string16 city = profile_loader_.GetCity();
   string16 postal_code = profile_loader_.GetPostalCode();
   string16 region = profile_loader_.GetRegion();
-  string16 country = profile_loader_.GetCountry();
+  string16 country_name_or_code = profile_loader_.GetCountry();
+  std::string country_code = AutofillCountry::GetCountryCode(
+      country_name_or_code, app_locale_);
 
   string16 street2 = CollapseAddress(post_office_box, neighborhood);
 
   profile->SetRawInfo(ADDRESS_HOME_LINE1, street);
   profile->SetRawInfo(ADDRESS_HOME_LINE2, street2);
   profile->SetRawInfo(ADDRESS_HOME_CITY, city);
   profile->SetRawInfo(ADDRESS_HOME_STATE, region);
   profile->SetRawInfo(ADDRESS_HOME_ZIP, postal_code);
-  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, country);
+  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16(country_code));

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

Please call SetInfo with the app_locale rather than doing the conversion within
this file.

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

Done.

 }
 
 void AuxiliaryProfilesAndroid::LoadName(AutofillProfile* profile) {
   string16 first_name = profile_loader_.GetFirstName();
   string16 middle_name = profile_loader_.GetMiddleName();
   string16 last_name = profile_loader_.GetLastName();
 
   profile->SetRawInfo(NAME_FIRST, first_name);
   profile->SetRawInfo(NAME_MIDDLE, middle_name);
   profile->SetRawInfo(NAME_LAST, last_name);
 }
 
 void AuxiliaryProfilesAndroid::LoadEmailAddress(AutofillProfile* profile) {
   std::vector<string16> emails;
   profile_loader_.GetEmailAddresses(&emails);
   profile->SetRawMultiInfo(EMAIL_ADDRESS, emails);
 }
 
 void AuxiliaryProfilesAndroid::LoadPhoneNumbers(AutofillProfile* profile) {
   std::vector<string16> phone_numbers;
   profile_loader_.GetPhoneNumbers(&phone_numbers);
   profile->SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, phone_numbers);
 }
 
 } // namespace autofill