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

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 68 matching lines @@
 const char kTestCCNumberVisa[] = "4111111111111111";
 const char kTestCCNumberMaster[] = "5555555555554444";
 const char kTestCCNumberDiscover[] = "6011111111111117";
 const char kTestCCNumberIncomplete[] = "4111111111";
 // Credit card number fails Luhn check.
 const char kTestCCNumberInvalid[] = "4111111111111112";
 
 
 void SetOutputValue(const DetailInputs& inputs,
                     DetailOutputMap* outputs,
-                    AutofillFieldType type,
+                    ServerFieldType type,
                     const base::string16& value) {
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     (*outputs)[&input] = input.type == type ?
         value :
         input.initial_value;
   }
 }
 
 scoped_ptr<wallet::WalletItems> CompleteAndValidWalletItems() {
@@ skipping 410 matching lines @@
 
 // Test for phone number validation.
 TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {
   // Construct DetailOutputMap from existing data.
   SwitchToAutofill();
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   for (size_t i = 0; i < 2; ++i) {
-    AutofillFieldType phone = i == 0 ? PHONE_HOME_WHOLE_NUMBER :
-                                       PHONE_BILLING_WHOLE_NUMBER;
-    AutofillFieldType address = i == 0 ? ADDRESS_HOME_COUNTRY :
-                                         ADDRESS_BILLING_COUNTRY;
+    ServerFieldType phone = i == 0 ? PHONE_HOME_WHOLE_NUMBER :
+                                     PHONE_BILLING_WHOLE_NUMBER;
+    ServerFieldType address = i == 0 ? ADDRESS_HOME_COUNTRY :
+                                       ADDRESS_BILLING_COUNTRY;
     DialogSection section = i == 0 ? SECTION_SHIPPING : SECTION_BILLING;
 
     controller()->EditClickedForSection(section);
 
     DetailOutputMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     // Make sure country is United States.
     SetOutputValue(inputs, &outputs, address, ASCIIToUTF16("United States"));
 
@@ skipping 470 matching lines @@
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
   shipping_model->ActivatedAt(2);
 
   controller()->OnAccept();
   ASSERT_EQ(20U, form_structure()->field_count());
-  EXPECT_EQ(ADDRESS_BILLING_STATE, form_structure()->field(9)->type());
-  EXPECT_EQ(ADDRESS_HOME_STATE, form_structure()->field(16)->type());
+  EXPECT_EQ(ADDRESS_BILLING_STATE,
+            form_structure()->field(9)->Type().server_type());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().server_type());
   string16 billing_state = form_structure()->field(9)->value;
   string16 shipping_state = form_structure()->field(16)->value;
   EXPECT_FALSE(billing_state.empty());
   EXPECT_FALSE(shipping_state.empty());
   EXPECT_NE(billing_state, shipping_state);
 
-  EXPECT_EQ(CREDIT_CARD_NAME, form_structure()->field(1)->type());
+  EXPECT_EQ(CREDIT_CARD_NAME, form_structure()->field(1)->Type().server_type());
   string16 cc_name = form_structure()->field(1)->value;
-  EXPECT_EQ(NAME_BILLING_FULL, form_structure()->field(6)->type());
+  EXPECT_EQ(NAME_BILLING_FULL,
+            form_structure()->field(6)->Type().server_type());
   string16 billing_name = form_structure()->field(6)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().server_type());
   string16 shipping_name = form_structure()->field(13)->value;
 
   EXPECT_FALSE(cc_name.empty());
   EXPECT_FALSE(billing_name.empty());
   EXPECT_FALSE(shipping_name.empty());
   // Billing name should always be the same as cardholder name.
   EXPECT_EQ(cc_name, billing_name);
   EXPECT_NE(cc_name, shipping_name);
 }
 
 // Test selecting UseBillingForShipping.
 TEST_F(AutofillDialogControllerTest, UseBillingAsShipping) {
   AutofillProfile full_profile(test::GetVerifiedProfile());
   AutofillProfile full_profile2(test::GetVerifiedProfile2());
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
   // Test after setting use billing for shipping.
   UseBillingForShipping();
 
   controller()->OnAccept();
   ASSERT_EQ(20U, form_structure()->field_count());
-  EXPECT_EQ(ADDRESS_BILLING_STATE, form_structure()->field(9)->type());
-  EXPECT_EQ(ADDRESS_HOME_STATE, form_structure()->field(16)->type());
+  EXPECT_EQ(ADDRESS_BILLING_STATE,
+            form_structure()->field(9)->Type().server_type());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().server_type());
   string16 billing_state = form_structure()->field(9)->value;
   string16 shipping_state = form_structure()->field(16)->value;
   EXPECT_FALSE(billing_state.empty());
   EXPECT_FALSE(shipping_state.empty());
   EXPECT_EQ(billing_state, shipping_state);
 
-  EXPECT_EQ(CREDIT_CARD_NAME, form_structure()->field(1)->type());
+  EXPECT_EQ(CREDIT_CARD_NAME,
+            form_structure()->field(1)->Type().server_type());
   string16 cc_name = form_structure()->field(1)->value;
-  EXPECT_EQ(NAME_BILLING_FULL, form_structure()->field(6)->type());
+  EXPECT_EQ(NAME_BILLING_FULL,
+            form_structure()->field(6)->Type().server_type());
   string16 billing_name = form_structure()->field(6)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().server_type());
   string16 shipping_name = form_structure()->field(13)->value;
 
   EXPECT_FALSE(cc_name.empty());
   EXPECT_FALSE(billing_name.empty());
   EXPECT_FALSE(shipping_name.empty());
   EXPECT_EQ(cc_name, billing_name);
   EXPECT_EQ(cc_name, shipping_name);
 }
 
 // Tests that shipping and billing telephone fields are supported, and filled
@@ skipping 16 matching lines @@
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&shipping_profile);
   controller()->GetTestingManager()->AddTestingProfile(&billing_profile);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   ui::MenuModel* billing_model =
       controller()->MenuModelForSection(SECTION_BILLING);
   billing_model->ActivatedAt(1);
 
   controller()->OnAccept();
   ASSERT_EQ(2U, form_structure()->field_count());
-  EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER, form_structure()->field(0)->type());
-  EXPECT_EQ(PHONE_BILLING_WHOLE_NUMBER, form_structure()->field(1)->type());
+  EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
+            form_structure()->field(0)->Type().server_type());
+  EXPECT_EQ(PHONE_BILLING_WHOLE_NUMBER,
+            form_structure()->field(1)->Type().server_type());
   EXPECT_EQ(shipping_profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
             form_structure()->field(0)->value);
   EXPECT_EQ(billing_profile.GetRawInfo(PHONE_BILLING_WHOLE_NUMBER),
             form_structure()->field(1)->value);
   EXPECT_NE(form_structure()->field(1)->value,
             form_structure()->field(0)->value);
 }
 
 TEST_F(AutofillDialogControllerTest, AcceptLegalDocuments) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
@@ skipping 378 matching lines @@
   FillCreditCardInputs();
 
   controller()->OnAccept();
   const AutofillProfile& edited_profile =
       controller()->GetTestingManager()->imported_profile();
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     EXPECT_EQ(input.type == NAME_FULL ? ASCIIToUTF16("Edited Name") :
                                         input.initial_value,
-              edited_profile.GetInfo(input.type, "en-US"));
+              edited_profile.GetInfo(AutofillType(input.type), "en-US"));
   }
 }
 
 // Tests that adding an autofill profile and then submitting works.
 TEST_F(AutofillDialogControllerTest, AddAutofillProfile) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_BILLING);
   // Activate the "Add billing address" menu item.
   model->ActivatedAt(model->GetItemCount() - 2);
 
   // Fill in the inputs from the profile.
   DetailOutputMap 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(input.type, "en-US");
+    outputs[&input] = full_profile2.GetInfo(AutofillType(input.type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_BILLING, outputs);
 
   controller()->OnAccept();
   const AutofillProfile& added_profile =
       controller()->GetTestingManager()->imported_profile();
 
   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(input.type, "en-US"),
-              added_profile.GetInfo(input.type, "en-US"));
+    EXPECT_EQ(full_profile2.GetInfo(AutofillType(input.type), "en-US"),
+              added_profile.GetInfo(AutofillType(input.type), "en-US"));
   }
 
   // Also, the currently selected email address should get added to the new
   // profile.
-  string16 original_email = full_profile.GetInfo(EMAIL_ADDRESS, "en-US");
+  string16 original_email =
+      full_profile.GetInfo(AutofillType(EMAIL_ADDRESS), "en-US");
   EXPECT_FALSE(original_email.empty());
   EXPECT_EQ(original_email,
-            added_profile.GetInfo(EMAIL_ADDRESS, "en-US"));
+            added_profile.GetInfo(AutofillType(EMAIL_ADDRESS), "en-US"));
 }
 
 // Makes sure that a newly added email address gets added to an existing profile
 // (as opposed to creating its own profile). http://crbug.com/240926
 TEST_F(AutofillDialogControllerTest, AddEmail) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_EMAIL);
   ASSERT_TRUE(model);
   // Activate the "Add email address" menu item.
   model->ActivatedAt(model->GetItemCount() - 2);
 
   // Fill in the inputs from the profile.
   DetailOutputMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   const DetailInput& input = inputs[0];
   string16 new_email = ASCIIToUTF16("addemailtest@example.com");
   outputs[&input] = new_email;
   controller()->GetView()->SetUserInput(SECTION_EMAIL, outputs);
 
   FillCreditCardInputs();
   controller()->OnAccept();
   std::vector<base::string16> email_values;
-  full_profile.GetMultiInfo(EMAIL_ADDRESS, "en-US", &email_values);
+  full_profile.GetMultiInfo(
+      AutofillType(EMAIL_ADDRESS), "en-US", &email_values);
   ASSERT_EQ(2U, email_values.size());
   EXPECT_EQ(new_email, email_values[1]);
 }
 
 TEST_F(AutofillDialogControllerTest, VerifyCvv) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               GetFullWallet(_)).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               AuthenticateInstrument(_, _)).Times(1);
 
@@ skipping 439 matching lines @@
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 
   // Email section should be hidden when using Wallet.
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_EMAIL));
 
   controller()->OnAccept();
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
 
   size_t i = 0;
   for (; i < form_structure()->field_count(); ++i) {
-    if (form_structure()->field(i)->type() == EMAIL_ADDRESS) {
+    if (form_structure()->field(i)->Type().server_type() == EMAIL_ADDRESS) {
       EXPECT_EQ(ASCIIToUTF16(kFakeEmail), form_structure()->field(i)->value);
       break;
     }
   }
   ASSERT_LT(i, form_structure()->field_count());
 }
 
 // Test if autofill types of returned form structure are correct for billing
 // entries.
 TEST_F(AutofillDialogControllerTest, AutofillTypes) {
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
   controller()->OnAccept();
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   ASSERT_EQ(20U, form_structure()->field_count());
-  EXPECT_EQ(EMAIL_ADDRESS, form_structure()->field(0)->type());
-  EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure()->field(2)->type());
-  EXPECT_EQ(ADDRESS_BILLING_STATE, form_structure()->field(9)->type());
-  EXPECT_EQ(ADDRESS_HOME_STATE, form_structure()->field(16)->type());
+  EXPECT_EQ(EMAIL_ADDRESS, form_structure()->field(0)->Type().server_type());
+  EXPECT_EQ(CREDIT_CARD_NUMBER,
+            form_structure()->field(2)->Type().server_type());
+  EXPECT_EQ(ADDRESS_BILLING_STATE,
+            form_structure()->field(9)->Type().server_type());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().server_type());
 }
 
 TEST_F(AutofillDialogControllerTest, SaveDetailsInChrome) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   CreditCard card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingCreditCard(&card);
@@ skipping 154 matching lines @@
 }
 
 // Ensure Wallet instruments marked expired by the server are shown as invalid.
 TEST_F(AutofillDialogControllerTest, WalletExpiredCard) {
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentExpired());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC_BILLING));
 
-  // Use |SetOutputValue()| to put the right AutofillFieldTypes into the map.
+  // Use |SetOutputValue()| to put the right ServerFieldTypes into the map.
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
   DetailOutputMap outputs;
   SetOutputValue(inputs, &outputs, COMPANY_NAME, ASCIIToUTF16("Bluth Company"));
 
   ValidityData validity_data =
       controller()->InputsAreValid(SECTION_CC_BILLING, outputs, VALIDATE_EDIT);
   EXPECT_EQ(1U, validity_data.count(CREDIT_CARD_EXP_MONTH));
   EXPECT_EQ(1U, validity_data.count(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
@@ skipping 230 matching lines @@
   EXPECT_CALL(*test_bubble_controller(), ShowAsNewCardSavedBubble(_)).Times(0);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
   controller()->set_dialog_type(DIALOG_TYPE_AUTOCHECKOUT);
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   controller()->OnAutocheckoutError();
   controller()->ViewClosed();
 }
 
 }  // namespace autofill