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)
@@ -11,6 +11,7 @@
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "components/autofill/browser/autofill_country.h"

[Ilya Sherman, 2013/04/05 07:18:41]

nit: No longer needed.

[jam, 2013/04/05 07:35:35]

Done.

 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "jni/PersonalDataManager_jni.h"
@@ -51,7 +52,8 @@
           profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
       ConvertUTF16ToJavaString(
           env,
-          profile.GetRawInfo(ADDRESS_HOME_COUNTRY)).obj(),
+          profile.GetInfo(ADDRESS_HOME_COUNTRY,
+                          g_browser_process->GetApplicationLocale())).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(),
@@ -90,10 +92,11 @@
       ADDRESS_HOME_ZIP,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getZip(env, jprofile)));
-  profile->SetRawInfo(
+  profile->SetInfo(
       ADDRESS_HOME_COUNTRY,
       ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getCountry(env, jprofile)));
+          Java_AutofillProfile_getCountry(env, jprofile)),
+          g_browser_process->GetApplicationLocale());

[Ilya Sherman, 2013/04/05 07:18:41]

nit: Looks like this line should be indented four fewer spaces.

[jam, 2013/04/05 07:35:35]

Done.

   profile->SetRawInfo(
       PHONE_HOME_WHOLE_NUMBER,
       ConvertJavaStringToUTF16(