Change DetailOutputMap to FieldValueMap

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 0426bbdb8a4948b88ffe881c05f9716dccb96406..c2fef65fc5fd2508866ce4d73e7d13285dab82b0 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -94,19 +94,18 @@ const char kTestCCNumberInvalid[] = "4111111111111112";
 void SetOutputValue(const DetailInputs& inputs,
                     ServerFieldType type,
                     const base::string16& value,
-                    DetailOutputMap* outputs) {
+                    FieldValueMap* outputs) {
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    if (input.type == type)
-      (*outputs)[&input] = value;
+    if (inputs[i].type == type)
+      (*outputs)[type] = value;
   }
 }
 
 // Copies the initial values from |inputs| into |outputs|.
-void CopyInitialValues(const DetailInputs& inputs, DetailOutputMap* outputs) {
+void CopyInitialValues(const DetailInputs& inputs, FieldValueMap* outputs) {
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
-    (*outputs)[&input] = input.initial_value;
+    (*outputs)[input.type] = input.initial_value;
   }
 }
 
@@ -183,7 +182,7 @@ class TestAutofillDialogView : public AutofillDialogView {
 
   virtual void FillSection(DialogSection section,
                            const DetailInput& originating_input) OVERRIDE {};
-  virtual void GetUserInput(DialogSection section, DetailOutputMap* output)
+  virtual void GetUserInput(DialogSection section, FieldValueMap* output)
       OVERRIDE {
     *output = outputs_[section];
   }
@@ -211,7 +210,7 @@ class TestAutofillDialogView : public AutofillDialogView {
 
   virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE {}
 
-  void SetUserInput(DialogSection section, const DetailOutputMap& map) {
+  void SetUserInput(DialogSection section, const FieldValueMap& map) {
     outputs_[section] = map;
   }
 
@@ -220,7 +219,7 @@ class TestAutofillDialogView : public AutofillDialogView {
   }
 
  private:
-  std::map<DialogSection, DetailOutputMap> outputs_;
+  std::map<DialogSection, FieldValueMap> outputs_;
 
   int updates_started_;
   bool save_details_locally_checked_;
@@ -441,11 +440,11 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
 
   // Fills the inputs in SECTION_CC with data.
   void FillCreditCardInputs() {
-    DetailOutputMap cc_outputs;
+    FieldValueMap cc_outputs;
     const DetailInputs& cc_inputs =
         controller()->RequestedFieldsForSection(SECTION_CC);
     for (size_t i = 0; i < cc_inputs.size(); ++i) {
-      cc_outputs[&cc_inputs[i]] = cc_inputs[i].type == CREDIT_CARD_NUMBER ?
+      cc_outputs[cc_inputs[i].type] = cc_inputs[i].type == CREDIT_CARD_NUMBER ?
           ASCIIToUTF16(kTestCCNumberVisa) : ASCIIToUTF16("11");
     }
     controller()->GetView()->SetUserInput(SECTION_CC, cc_outputs);
@@ -453,18 +452,17 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
 
   // Fills the inputs in SECTION_CC_BILLING with valid data.
   void FillCCBillingInputs() {
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
     AutofillProfile full_profile(test::GetVerifiedProfile());
     CreditCard full_card(test::GetCreditCard());
     for (size_t i = 0; i < inputs.size(); ++i) {
-      const DetailInput& input = inputs[i];
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
+      const ServerFieldType type = inputs[i].type;
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
 
-      if (outputs[&input].empty())
-        outputs[&input] = full_card.GetInfo(AutofillType(input.type), "en-US");
+      if (outputs[type].empty())
+        outputs[type] = full_card.GetInfo(AutofillType(type), "en-US");
     }
     controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
   }
@@ -479,7 +477,7 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
       model->ActivatedAt(model->GetItemCount() - 2);
 
     // Fill the inputs.
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     for (size_t i = 0; i < inputs.size(); ++i) {
@@ -489,7 +487,7 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
         output = ASCIIToUTF16("123");
       else
         output = data_model.GetInfo(AutofillType(type), "en-US");
-      outputs[&inputs[i]] = output;
+      outputs[inputs[i].type] = output;
     }
     controller()->GetView()->SetUserInput(section, outputs);
   }
@@ -526,7 +524,7 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
   void ValidateCCNumber(DialogSection section,
                         const std::string& cc_number,
                         bool should_pass) {
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
 
@@ -644,7 +642,7 @@ TEST_F(AutofillDialogControllerTest, ValidityCheck) {
 
 // Test for phone number validation.
 TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {
-  // Construct DetailOutputMap from existing data.
+  // Construct FieldValueMap from existing data.
   SwitchToAutofill();
 
   for (size_t i = 0; i < 2; ++i) {
@@ -654,14 +652,13 @@ TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {
                                        ADDRESS_BILLING_COUNTRY;
     DialogSection section = i == 0 ? SECTION_SHIPPING : SECTION_BILLING;
 
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     AutofillProfile full_profile(test::GetVerifiedProfile());
     for (size_t i = 0; i < inputs.size(); ++i) {
-      const DetailInput& input = inputs[i];
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
+      const ServerFieldType type = inputs[i].type;
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
     }
 
     // Make sure country is United States.
@@ -705,7 +702,7 @@ TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {
 }
 
 TEST_F(AutofillDialogControllerTest, ExpirationDateValidity) {
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
 
@@ -753,10 +750,10 @@ TEST_F(AutofillDialogControllerTest, ExpirationDateValidity) {
 }
 
 TEST_F(AutofillDialogControllerTest, BillingNameValidation) {
-  // Construct DetailOutputMap from AutofillProfile data.
+  // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
 
@@ -780,7 +777,7 @@ TEST_F(AutofillDialogControllerTest, BillingNameValidation) {
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
-  DetailOutputMap wallet_outputs;
+  FieldValueMap wallet_outputs;
   const DetailInputs& wallet_inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
 
@@ -819,7 +816,7 @@ TEST_F(AutofillDialogControllerTest, BillingNameValidation) {
 }
 
 TEST_F(AutofillDialogControllerTest, CreditCardNumberValidation) {
-  // Construct DetailOutputMap from AutofillProfile data.
+  // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
   // Should accept AMEX, Visa, Master and Discover.
@@ -1585,22 +1582,20 @@ TEST_F(AutofillDialogControllerTest, SaveInstrumentSameAsBilling) {
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_CC_BILLING);
   model->ActivatedAt(model->GetItemCount() - 2);
 
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
   AutofillProfile full_profile(test::GetVerifiedProfile());
   CreditCard full_card(test::GetCreditCard());
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    if (input.type == ADDRESS_BILLING_LINE1) {
-      outputs[&input] = ASCIIToUTF16(kEditedBillingAddress);
-    } else {
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
-    }
+    const ServerFieldType type = inputs[i].type;
+    if (type == ADDRESS_BILLING_LINE1)
+      outputs[type] = ASCIIToUTF16(kEditedBillingAddress);
+    else
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
 
-    if (outputs[&input].empty())
-      outputs[&input] = full_card.GetInfo(AutofillType(input.type), "en-US");
+    if (outputs[type].empty())
+      outputs[type] = full_card.GetInfo(AutofillType(type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
 
@@ -1670,13 +1665,13 @@ TEST_F(AutofillDialogControllerTest, AddAutofillProfile) {
   model->ActivatedAt(model->GetItemCount() - 2);
 
   // Fill in the inputs from the profile.
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   AutofillProfile full_profile2(test::GetVerifiedProfile2());
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    outputs[&input] = full_profile2.GetInfo(AutofillType(input.type), "en-US");
+    const ServerFieldType type = inputs[i].type;
+    outputs[type] = full_profile2.GetInfo(AutofillType(type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_BILLING, outputs);
 
@@ -1687,9 +1682,9 @@ TEST_F(AutofillDialogControllerTest, AddAutofillProfile) {
   const DetailInputs& shipping_inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   for (size_t i = 0; i < shipping_inputs.size(); ++i) {
-    const DetailInput& input = shipping_inputs[i];
-    EXPECT_EQ(full_profile2.GetInfo(AutofillType(input.type), "en-US"),
-              added_profile.GetInfo(AutofillType(input.type), "en-US"));
+    const ServerFieldType type = shipping_inputs[i].type;
+    EXPECT_EQ(full_profile2.GetInfo(AutofillType(type), "en-US"),
+              added_profile.GetInfo(AutofillType(type), "en-US"));
   }
 }
 
@@ -2202,7 +2197,7 @@ TEST_F(AutofillDialogControllerTest, WalletExpiredCard) {
   // Use |SetOutputValue()| to put the right ServerFieldTypes into the map.
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   CopyInitialValues(inputs, &outputs);
   SetOutputValue(inputs, COMPANY_NAME, ASCIIToUTF16("Bluth Company"), &outputs);
 
@@ -2609,7 +2604,7 @@ TEST_F(AutofillDialogControllerTest, InputEditability) {
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   CopyInitialValues(inputs, &outputs);
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);