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

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Index: chrome/browser/ui/views/autofill/autofill_dialog_views.cc
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 7dfa350c80cb19824f6ae07140a27f344547772a..6b5775a8186fc0fd8f56b5657915bec23ea69cc5 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -1981,11 +1981,9 @@ views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
       SelectComboboxValueOrSetToDefault(combobox, input.initial_value);
       view_to_add.reset(combobox);
     } else {
-      DecoratedTextfield* field = new DecoratedTextfield(
-          input.initial_value,
-          l10n_util::GetStringUTF16(input.placeholder_text_rid),
-          this);
-
+      DecoratedTextfield* field = new DecoratedTextfield(input.initial_value,
+                                                         input.placeholder_text,
+                                                         this);
       textfields->insert(std::make_pair(input.type, field));
       view_to_add.reset(field);
     }
@@ -2028,8 +2026,10 @@ views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
                     views::GridLayout::FILL, views::GridLayout::FILL,
                     1, 0);
 
-    if (input.length == DetailInput::LONG)
+    if (input.length == DetailInput::LONG ||
+        input.length == DetailInput::SHORT_EOL) {
       ++column_set_id;
+    }
   }
 
   SetIconsForSection(section);