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

chrome/browser/ui/autofill/data_model_wrapper.h

Index: chrome/browser/ui/autofill/data_model_wrapper.h
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.h b/chrome/browser/ui/autofill/data_model_wrapper.h
index 3cb56613340a0a96e5c1efdc5d3bb5299670519b..64aa7501a70c6c68ea66a3ee95d4ff9723360cde 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.h
+++ b/chrome/browser/ui/autofill/data_model_wrapper.h
@@ -36,8 +36,8 @@ class DataModelWrapper {
   virtual ~DataModelWrapper();
 
   // Fills in |inputs| with the data that this model contains (|inputs| is an
-  // out-param).
-  void FillInputs(DetailInputs* inputs);
+  // out-param). |country_code| is the country used for |inputs|' section.
+  void FillInputs(DetailInputs* inputs, const std::string& country_code);
 
   // Returns the data for a specific autocomplete type in a format for filling
   // into a web form.
@@ -219,18 +219,19 @@ class FullWalletShippingWrapper : public DataModelWrapper {
   DISALLOW_COPY_AND_ASSIGN(FullWalletShippingWrapper);
 };
 
-// A DataModelWrapper to copy the output of one section to the input of another.
-class DetailOutputWrapper : public DataModelWrapper {
+// A DataModelWrapper to copy the preserved input of a section to a newly
+// created one.
+class SnapshotWrapper : public DataModelWrapper {
  public:
-  explicit DetailOutputWrapper(const DetailOutputMap& outputs);
-  virtual ~DetailOutputWrapper();
+  explicit SnapshotWrapper(const UserInputSnapshot& snapshot);
+  virtual ~SnapshotWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
 
  private:
-  const DetailOutputMap& outputs_;
+  const UserInputSnapshot& snapshot_;
 
-  DISALLOW_COPY_AND_ASSIGN(DetailOutputWrapper);
+  DISALLOW_COPY_AND_ASSIGN(SnapshotWrapper);
 };
 
 }  // namespace autofill