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

chrome/browser/ui/autofill/autofill_dialog_common.h

Index: chrome/browser/ui/autofill/autofill_dialog_common.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_common.h b/chrome/browser/ui/autofill/autofill_dialog_common.h
index 91ce21c3ffe471c36e01f87c7a6221884ddd2281..9ff300793f66087a64fcb8d1583c754855c185d0 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_common.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_common.h
@@ -20,6 +20,12 @@ class Address;
 namespace autofill {
 namespace common {
 
+// The types of addresses this class supports building.
+enum AddressType {
+  ADDRESS_TYPE_BILLING,
+  ADDRESS_TYPE_SHIPPING,
+};
+
 // Returns true if |input| should be shown when |field_type| has been requested.
 bool InputTypeMatchesFieldType(const DetailInput& input,
                                const AutofillType& field_type);
@@ -34,7 +40,11 @@ bool DetailInputMatchesField(DialogSection section,
 bool IsCreditCardType(ServerFieldType type);
 
 // Constructs |inputs| from template data for a given |dialog_section|.
-void BuildInputsForSection(DialogSection dialog_section, DetailInputs* inputs);
+// |country_country| specifies the country code that the inputs should be built
+// for.
+void BuildInputsForSection(DialogSection dialog_section,
+                           DetailInputs* inputs,
+                           const std::string& country_code);
 
 // Returns the AutofillMetrics::DIALOG_UI_*_ITEM_ADDED metric corresponding
 // to the |section|.
@@ -46,9 +56,9 @@ AutofillMetrics::DialogUiEvent DialogSectionToUiItemAddedEvent(
 AutofillMetrics::DialogUiEvent DialogSectionToUiSelectionChangedEvent(
     DialogSection section);
 
-// We hardcode some values. In particular, we don't yet allow the user to change
-// the country: http://crbug.com/247518
-string16 GetHardcodedValueForType(ServerFieldType type);
+// Returns the initial value for an input |type| in |country_code|.
+base::string16 GetInitialValueForType(ServerFieldType type,
+                                      const std::string& country_code);
 
 }  // namespace common
 }  // namespace autofill