Turn Autofill country text input into a Spinner.

chrome/browser/ui/autofill/country_combobox_model.cc

Index: chrome/browser/ui/autofill/country_combobox_model.cc
diff --git a/chrome/browser/ui/autofill/country_combobox_model.cc b/chrome/browser/ui/autofill/country_combobox_model.cc
index fda64cb4407d06e7e507e3f2c62be4a13dfa2154..5cff94340daf927a3e801f8a5183731a133ba9c0 100644
--- a/chrome/browser/ui/autofill/country_combobox_model.cc
+++ b/chrome/browser/ui/autofill/country_combobox_model.cc
@@ -39,8 +39,11 @@ void CountryComboboxModel::SetCountries(
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   if (filter.is_null() || filter.Run(default_country_code)) {
     countries_.push_back(new AutofillCountry(default_country_code, app_locale));
-    // The separator item.
+#if !defined(OS_ANDROID)
+    // The separator item. On Android, there are separators after all items, so
+    // this is unnecessary.
     countries_.push_back(NULL);
+#endif
   }
 
   // The sorted list of countries.