Ask libaddressinput for address components to use in requestAutocomplete().

chrome/browser/ui/webui/options/autofill_options_handler.cc

Index: chrome/browser/ui/webui/options/autofill_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 99d79a7f862288116d5f044c6f112b3cd8990a50..8cceb43b47094bde805c289f16aa7196c07e49fc 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -44,10 +44,11 @@ const char kSettingsOrigin[] = "Chrome settings";
 // Sets data related to the country <select>.
 void SetCountryData(const PersonalDataManager& manager,
                     base::DictionaryValue* localized_strings) {
-  autofill::CountryComboboxModel model(manager);
+  std::string default_country = manager.GetDefaultCountryCodeForNewAddress();
+  autofill::CountryComboboxModel model(default_country);
   const std::vector<AutofillCountry*>& countries = model.countries();
   localized_strings->SetString("defaultCountryCode",
-                               countries.front()->country_code());
+                               model.GetDefaultCountryCode());
 
   // An ordered list of options to show in the <select>.
   scoped_ptr<base::ListValue> country_list(new base::ListValue());