Turn Autofill country text input into a Spinner.

chrome/browser/autofill/android/personal_data_manager_android.cc

Index: chrome/browser/autofill/android/personal_data_manager_android.cc
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 57d7ec8cbce461027ce531397a69d8a424e44473..1888a034266247997f4700c22dbdc4972ea55daa 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -42,30 +42,20 @@ ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(NAME_FULL)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)).obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_STATE))
+          .obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_CITY))
+          .obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
-                          g_browser_process->GetApplicationLocale())).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
+          .obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER))
+          .obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj(),
       ConvertUTF8ToJavaString(env, profile.language_code()).obj());
 }
@@ -117,11 +107,10 @@ void PopulateNativeProfileFromJava(
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getSortingCode(env, jprofile)),
       g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_COUNTRY),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getCountry(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
+  profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
+                   ConvertJavaStringToUTF16(
+                       Java_AutofillProfile_getCountryCode(env, jprofile)),
+                   g_browser_process->GetApplicationLocale());
   profile->SetInfo(
       AutofillType(PHONE_HOME_WHOLE_NUMBER),
       ConvertJavaStringToUTF16(