Change DetailOutputMap to FieldValueMap

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 20bb3143390eb3c88d127689ddfd8df1463c2432..62bb973828f3332d8f5d05de50c7744a3bdeb2b4 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -1340,15 +1340,15 @@ void AutofillDialogViews::FillSection(DialogSection section,
 }
 
 void AutofillDialogViews::GetUserInput(DialogSection section,
-                                       DetailOutputMap* output) {
+                                       FieldValueMap* output) {
   DetailsGroup* group = GroupForSection(section);
   for (TextfieldMap::const_iterator it = group->textfields.begin();
        it != group->textfields.end(); ++it) {
-    output->insert(std::make_pair(it->first, it->second->text()));
+    output->insert(std::make_pair(it->first->type, it->second->text()));
   }
   for (ComboboxMap::const_iterator it = group->comboboxes.begin();
        it != group->comboboxes.end(); ++it) {
-    output->insert(std::make_pair(it->first,
+    output->insert(std::make_pair(it->first->type,
         it->second->model()->GetItemAt(it->second->selected_index())));
   }
 }
@@ -2198,7 +2198,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
   DCHECK(group.container->visible());
 
   scoped_ptr<DetailInput> cvc_input;
-  DetailOutputMap detail_outputs;
+  FieldValueMap detail_outputs;
 
   if (group.manual_input->visible()) {
     for (TextfieldMap::const_iterator iter = group.textfields.begin();
@@ -2206,7 +2206,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
       if (!iter->second->editable())
         continue;
 
-      detail_outputs[iter->first] = iter->second->text();
+      detail_outputs[iter->first->type] = iter->second->text();
     }
     for (ComboboxMap::const_iterator iter = group.comboboxes.begin();
          iter != group.comboboxes.end(); ++iter) {
@@ -2216,7 +2216,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
       views::Combobox* combobox = iter->second;
       base::string16 item =
           combobox->model()->GetItemAt(combobox->selected_index());
-      detail_outputs[iter->first] = item;
+      detail_outputs[iter->first->type] = item;
     }
   } else if (group.section == GetCreditCardSection()) {
     DecoratedTextfield* decorated_cvc =
@@ -2224,7 +2224,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
     if (decorated_cvc->visible()) {
       cvc_input.reset(new DetailInput);
       cvc_input->type = CREDIT_CARD_VERIFICATION_CODE;
-      detail_outputs[cvc_input.get()] = decorated_cvc->text();
+      detail_outputs[cvc_input->type] = decorated_cvc->text();
     }
   }
 
@@ -2397,17 +2397,9 @@ void AutofillDialogViews::DetailsContainerBoundsChanged() {
 }
 
 void AutofillDialogViews::SetIconsForSection(DialogSection section) {
-  DetailOutputMap user_input;
+  FieldValueMap user_input;
   GetUserInput(section, &user_input);
-  FieldValueMap field_values;
-  for (DetailOutputMap::const_iterator user_input_it = user_input.begin();
-       user_input_it != user_input.end();
-       ++user_input_it) {
-    const DetailInput* field_detail = user_input_it->first;
-    const string16& field_value = user_input_it->second;
-    field_values[field_detail->type] = field_value;
-  }
-  FieldIconMap field_icons = delegate_->IconsForFields(field_values);
+  FieldIconMap field_icons = delegate_->IconsForFields(user_input);
   TextfieldMap* textfields = &GroupForSection(section)->textfields;
   for (TextfieldMap::const_iterator textfield_it = textfields->begin();
        textfield_it != textfields->end();