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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 8091f5be2636c82a1146d11bcc6c949e9553f95d..84b6e32054c13c1c10fc71d233f810357fa06596 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -146,6 +146,9 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
                                           bool was_edit) OVERRIDE;
   virtual bool HandleKeyPressEventInInput(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
+  virtual void ComboboxItemSelected(ui::ComboboxModel* model,
+                                    DialogSection section,
+                                    int index) OVERRIDE;
   virtual void FocusMoved() OVERRIDE;
   virtual bool ShouldShowErrorBubble() const OVERRIDE;
   virtual void ViewClosed() OVERRIDE;
@@ -356,11 +359,11 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
                       const base::string16& value);
 
   // Takes a snapshot of the newly inputted user data in |view_| (if it exists).
-  DetailOutputMap TakeUserInputSnapshot();
+  UserInputSnapshot TakeUserInputSnapshot();
 
   // Fills the detail inputs from a previously taken user input snapshot. Does
   // not update the view.
-  void RestoreUserInputFromSnapshot(const DetailOutputMap& snapshot);
+  void RestoreUserInputFromSnapshot(const UserInputSnapshot& snapshot);
 
   // Tells the view to update |section|.
   void UpdateSection(DialogSection section);
@@ -453,6 +456,14 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
 
+  // Gets the country code (e.g. "US") that should be used for |section|.
+  std::string GetCountryCodeForSection(DialogSection section) const;
+
+  // Sets the country code that should be used for |section|. Also rebuilds this
+  // section's inputs and updates the view.
+  void SetCountryCodeForSection(DialogSection section,
+                                const std::string& country_code);
+
   // Hides |popup_controller_|'s popup view, if it exists.
   void HidePopup();
 
@@ -665,6 +676,10 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
   // we should show a shipping section.
   bool cares_about_shipping_;
 
+  // Country codes to use when creating/filling billing or shipping inputs.
+  std::string billing_country_code_;
+  std::string shipping_country_code_;
+
   // The GUIDs for the currently showing unverified profiles popup.
   std::vector<PersonalDataManager::GUIDPair> popup_guids_;