[Autofill] Distinguish between native field types and potentially HTML field types.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 104 matching lines @@
 
   virtual ~TestAutofillDialogController() {}
 
   virtual void ViewClosed() OVERRIDE {
     message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
 
   virtual string16 InputValidityMessage(
       DialogSection section,
-      AutofillFieldType type,
+      ServerFieldType type,
       const string16& value) OVERRIDE {
     if (!use_validation_)
       return string16();
     return AutofillDialogControllerImpl::InputValidityMessage(
         section, type, value);
   }
 
   virtual ValidityData InputsAreValid(
       DialogSection section,
       const DetailOutputMap& inputs,
@@ skipping 354 matching lines @@
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
 
   ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
   // All inputs should be filled.
   AutofillProfileWrapper wrapper(&full_profile, 0);
   for (size_t i = 0; i < inputs.size(); ++i) {
-    EXPECT_EQ(wrapper.GetInfo(inputs[i].type),
+    EXPECT_EQ(wrapper.GetInfo(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i]));
   }
 
   // Now simulate some user edits and try again.
   std::vector<string16> expectations;
   for (size_t i = 0; i < inputs.size(); ++i) {
     string16 users_input = i % 2 == 0 ? string16() : ASCIIToUTF16("dummy");
     view->SetTextContentsOfInput(inputs[i], users_input);
     // Empty inputs should be filled, others should be left alone.
     string16 expectation =
         &inputs[i] == &triggering_input || users_input.empty() ?
-        wrapper.GetInfo(inputs[i].type) :
+        wrapper.GetInfo(AutofillType(inputs[i].type)) :
         users_input;
     expectations.push_back(expectation);
   }
 
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
   ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
@@ skipping 60 matching lines @@
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
 
   ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
   // All inputs should be filled.
   AutofillCreditCardWrapper wrapper1(&card1);
   for (size_t i = 0; i < inputs.size(); ++i) {
-    EXPECT_EQ(wrapper1.GetInfo(inputs[i].type),
+    EXPECT_EQ(wrapper1.GetInfo(AutofillType(inputs[i].type)),
               view->GetTextContentsOfInput(inputs[i]));
   }
 
   // Try again with different data. Only expiration date and the triggering
   // input should be overwritten.
   value = card2.GetRawInfo(triggering_input.type);
   view->SetTextContentsOfInput(triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(triggering_input);
   ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
   AutofillCreditCardWrapper wrapper2(&card2);
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     if (&input == &triggering_input ||
         input.type == CREDIT_CARD_EXP_MONTH ||
         input.type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
-      EXPECT_EQ(wrapper2.GetInfo(input.type),
+      EXPECT_EQ(wrapper2.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     } else if (input.type == CREDIT_CARD_VERIFICATION_CODE) {
       EXPECT_TRUE(view->GetTextContentsOfInput(input).empty());
     } else {
-      EXPECT_EQ(wrapper1.GetInfo(input.type),
+      EXPECT_EQ(wrapper1.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     }
   }
 
   // Now fill from a profile. It should not overwrite any CC info.
   const DetailInputs& billing_inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   const DetailInput& billing_triggering_input = billing_inputs[0];
   value = full_profile.GetRawInfo(triggering_input.type);
   view->SetTextContentsOfInput(billing_triggering_input,
                                value.substr(0, value.size() / 2));
   view->ActivateInput(billing_triggering_input);
 
   ASSERT_EQ(&billing_triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     if (&input == &triggering_input ||
         input.type == CREDIT_CARD_EXP_MONTH ||
         input.type == CREDIT_CARD_EXP_4_DIGIT_YEAR) {
-      EXPECT_EQ(wrapper2.GetInfo(input.type),
+      EXPECT_EQ(wrapper2.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     } else if (input.type == CREDIT_CARD_VERIFICATION_CODE) {
       EXPECT_TRUE(view->GetTextContentsOfInput(input).empty());
     } else {
-      EXPECT_EQ(wrapper1.GetInfo(input.type),
+      EXPECT_EQ(wrapper1.GetInfo(AutofillType(input.type)),
                 view->GetTextContentsOfInput(input));
     }
   }
 }
 
 // Tests that credit card number is disabled while editing a Wallet instrument.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, WalletCreditCardDisabled) {
   InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
   controller()->OnUserNameFetchSuccess("user@example.com");
 
@@ skipping 213 matching lines @@
   EXPECT_EQ(cc_number.type, new_cc_number.type);
   EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
             view->GetTextContentsOfInput(new_cc_number));
 
   EXPECT_NE(ASCIIToUTF16("shipping name"),
             view->GetTextContentsOfInput(shipping_zip));
 }
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 
 }  // namespace autofill