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

chrome/browser/autofill/android/personal_data_manager_android.cc

Index: chrome/browser/autofill/android/personal_data_manager_android.cc
===================================================================
--- chrome/browser/autofill/android/personal_data_manager_android.cc	(revision 192389)
+++ chrome/browser/autofill/android/personal_data_manager_android.cc	(working copy)
@@ -90,11 +90,12 @@
       ADDRESS_HOME_ZIP,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getZip(env, jprofile)));
+  string16 country_name_or_code = ConvertJavaStringToUTF16(
+      Java_AutofillProfile_getCountry(env, jprofile))
+  std::string country_code = AutofillCountry::GetCountryCode(
+      country_name_or_code, g_browser_process->GetApplicationLocale());
+  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16(country_code));

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

Please use SetInfo() rather than SetRawInfo() for this.

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

Done.

   profile->SetRawInfo(
-      ADDRESS_HOME_COUNTRY,
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getCountry(env, jprofile)));
-  profile->SetRawInfo(
       PHONE_HOME_WHOLE_NUMBER,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getPhoneNumber(env, jprofile)));