Turn Autofill country text input into a Spinner.

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
index 919a9d757df4273013305173cdebc8a6504e8b47..e43c1ddee15e0c65d0ed8bc9c1bee99fab4505c2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
@@ -47,7 +47,7 @@ public class PersonalDataManager {
         private String mDependentLocality;
         private String mPostalCode;
         private String mSortingCode;
-        private String mCountry;
+        private String mCountryCode;
         private String mPhoneNumber;
         private String mEmailAddress;
         private String mLanguageCode;
@@ -69,7 +69,7 @@ public class PersonalDataManager {
                 String region,
                 String locality, String dependentLocality,
                 String postalCode, String sortingCode,
-                String country, String phoneNumber, String emailAddress, String languageCode) {
+                String countryCode, String phoneNumber, String emailAddress, String languageCode) {
             mGUID = guid;
             mOrigin = origin;
             mFullName = fullName;
@@ -80,7 +80,7 @@ public class PersonalDataManager {
             mDependentLocality = dependentLocality;
             mPostalCode = postalCode;
             mSortingCode = sortingCode;
-            mCountry = country;
+            mCountryCode = countryCode;
             mPhoneNumber = phoneNumber;
             mEmailAddress = emailAddress;
             mLanguageCode = languageCode;
@@ -137,12 +137,8 @@ public class PersonalDataManager {
         }
 
         @CalledByNative("AutofillProfile")
-        public String getCountry() {
-            return mCountry;
-        }
-
         public String getCountryCode() {
-            return nativeToCountryCode(mCountry);
+            return mCountryCode;
         }
 
         @CalledByNative("AutofillProfile")
@@ -200,8 +196,8 @@ public class PersonalDataManager {
             mSortingCode = sortingCode;
         }
 
-        public void setCountry(String country) {
-            mCountry = country;
+        public void setCountryCode(String countryCode) {
+            mCountryCode = countryCode;
         }
 
         public void setPhoneNumber(String phoneNumber) {