Turn Autofill country text input into a Spinner.

chrome/browser/ui/autofill/country_combobox_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   countries_.clear();
 
   // Insert the default country at the top as well as in the ordered list.
   std::string default_country_code =
       manager.GetDefaultCountryCodeForNewAddress();
   DCHECK(!default_country_code.empty());
 
   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.
   std::vector<std::string> available_countries;
   AutofillCountry::GetAvailableCountries(&available_countries);
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
   // Filter out the countries that do not have rules for address input and
   // validation.
   const std::vector<std::string>& addressinput_countries =
@@ skipping 39 matching lines @@
 
 bool CountryComboboxModel::IsItemSeparatorAt(int index) {
   return !countries_[index];
 }
 
 std::string CountryComboboxModel::GetDefaultCountryCode() const {
   return countries_[GetDefaultIndex()]->country_code();
 }
 
 }  // namespace autofill