Change DetailOutputMap to FieldValueMap

chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
@@ skipping 121 matching lines @@
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH))
       .WillRepeatedly(Return(&comboModel));
 
   ResetContainer();
 
   NSPopUpButton* popup = base::mac::ObjCCastStrict<NSPopUpButton>(
       [container_ getField:CREDIT_CARD_EXP_MONTH]);
   [popup selectItemWithTitle:@"02"];
   [[container_ getField:EMAIL_ADDRESS] setStringValue:@"magic@example.org"];
 
-  autofill::DetailOutputMap output;
+  autofill::FieldValueMap output;
   [container_ getInputs:&output];
 
   ASSERT_EQ(inputs.size(), output.size());
-  EXPECT_EQ(ASCIIToUTF16("magic@example.org"), output[&inputs[0]]);
-  EXPECT_EQ(ASCIIToUTF16("02"), output[&inputs[1]]);
+  EXPECT_EQ(ASCIIToUTF16("magic@example.org"), output[inputs[0].type]);
+  EXPECT_EQ(ASCIIToUTF16("02"), output[inputs[1].type]);
 }
 
 TEST_F(AutofillSectionContainerTest, SuggestionsPopulatedByController) {
   ui::SimpleMenuModel model(NULL);
   model.AddItem(10, ASCIIToUTF16("a"));
   model.AddItem(11, ASCIIToUTF16("b"));
 
   using namespace autofill;
   using namespace testing;
 
@@ skipping 52 matching lines @@
   const DetailInput kTestInputs[] = {
     { 1, EMAIL_ADDRESS, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
     { 2, CREDIT_CARD_EXP_MONTH }
   };
 
   MonthComboboxModel comboModel;
   DetailInputs inputs;
   inputs.push_back(kTestInputs[0]);
   inputs.push_back(kTestInputs[1]);
 
-  DetailOutputMap output;
   ValidityMessages validity, validity2;
 
   validity.Set(EMAIL_ADDRESS,
       ValidityMessage(ASCIIToUTF16("Some error message"), false));
   validity2.Set(CREDIT_CARD_EXP_MONTH,
       ValidityMessage(ASCIIToUTF16("Some other error message"), false));
   EXPECT_CALL(delegate_, RequestedFieldsForSection(section_))
       .WillOnce(ReturnRef(inputs));
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(EMAIL_ADDRESS))
       .WillRepeatedly(ReturnNull());
   EXPECT_CALL(delegate_, ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH))
       .WillRepeatedly(Return(&comboModel));
 
   ResetContainer();
+  FieldValueMap output;
   [container_ getInputs:&output];
   EXPECT_CALL(delegate_, InputsAreValid(section_, output))
       .WillOnce(Return(validity))
       .WillOnce(Return(validity2));
 
   [container_ validateFor:VALIDATE_FINAL];
   NSControl<AutofillInputField>* field = [container_ getField:EMAIL_ADDRESS];
   EXPECT_TRUE([field invalid]);
   field = [container_ getField:CREDIT_CARD_EXP_MONTH];
   EXPECT_FALSE([field invalid]);
 
   [container_ validateFor:VALIDATE_FINAL];
   field = [container_ getField:EMAIL_ADDRESS];
   EXPECT_FALSE([field invalid]);
   field = [container_ getField:CREDIT_CARD_EXP_MONTH];
   EXPECT_TRUE([field invalid]);
 }