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

chrome/browser/ui/autofill/autofill_dialog_types.h

Index: chrome/browser/ui/autofill/autofill_dialog_types.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_types.h b/chrome/browser/ui/autofill/autofill_dialog_types.h
index 9c96b8bb97347df4c4482a3ccde74dc1b62e8dd2..3cfdcc37f2fdfc677ab85b7891187e0f53624a13 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_types.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_types.h
@@ -28,9 +28,10 @@ class AutofillField;
 // dialog.
 struct DetailInput {
   enum Length {
-    SHORT,  // Short inputs share a line with other short inputs. [ CVC ][ Zip ]
-    LONG,   // Long inputs will be given their own full line.     [ City       ]
-    NONE,   // Input will not be shown.
+    SHORT,      // Shares a line with other short inputs. -> [ CVC ][ Zip ]
+    SHORT_EOL,  // Shares a line but causes inputs to wrap.  [ CVC ][ Zip ] <-
+    LONG,       // Will be given its own full line.       -> [ City       ] <-
+    NONE,       // Input will not be shown.
   };
 
   // Used to determine which inputs share lines when laying out.
@@ -38,8 +39,8 @@ struct DetailInput {
 
   ServerFieldType type;
 
-  // Placeholder text resource ID.
-  int placeholder_text_rid;
+  // Text shown when the input is at its default state (e.g. empty).
+  base::string16 placeholder_text;
 
   // A number between 0 and 1.0 that describes how much of the horizontal space
   // in the row should be allotted to this input. 0 is equivalent to 1.