[Autofill] Add a separate enumeration for HTML field type hints.

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 993 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().server_type());
   EXPECT_EQ(ADDRESS_HOME_STATE,
-            form_structure()->field(16)->Type().server_type());
+            form_structure()->field(9)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
   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().server_type());
+  EXPECT_EQ(CREDIT_CARD_NAME,
+            form_structure()->field(1)->Type().GetStorableType());
   string16 cc_name = form_structure()->field(1)->value;
-  EXPECT_EQ(NAME_BILLING_FULL,
-            form_structure()->field(6)->Type().server_type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
+  EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
   string16 billing_name = form_structure()->field(6)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().server_type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
+  EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
   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().server_type());
   EXPECT_EQ(ADDRESS_HOME_STATE,
-            form_structure()->field(16)->Type().server_type());
+            form_structure()->field(9)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
   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().server_type());
+            form_structure()->field(1)->Type().GetStorableType());
   string16 cc_name = form_structure()->field(1)->value;
-  EXPECT_EQ(NAME_BILLING_FULL,
-            form_structure()->field(6)->Type().server_type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());
+  EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());
   string16 billing_name = form_structure()->field(6)->value;
-  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().server_type());
+  EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());
+  EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
   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 17 matching lines @@
   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().server_type());
-  EXPECT_EQ(PHONE_BILLING_WHOLE_NUMBER,
-            form_structure()->field(1)->Type().server_type());
+            form_structure()->field(0)->Type().GetStorableType());
+  EXPECT_EQ(PHONE_HOME, form_structure()->field(0)->Type().group());
+  EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
+            form_structure()->field(1)->Type().GetStorableType());
+  EXPECT_EQ(PHONE_BILLING, form_structure()->field(1)->Type().group());
   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 913 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().server_type() == EMAIL_ADDRESS) {
+    if (form_structure()->field(i)->Type().GetStorableType() == 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().server_type());
+  EXPECT_EQ(EMAIL_ADDRESS,
+            form_structure()->field(0)->Type().GetStorableType());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
-            form_structure()->field(2)->Type().server_type());
-  EXPECT_EQ(ADDRESS_BILLING_STATE,
-            form_structure()->field(9)->Type().server_type());
+            form_structure()->field(2)->Type().GetStorableType());
   EXPECT_EQ(ADDRESS_HOME_STATE,
-            form_structure()->field(16)->Type().server_type());
+            form_structure()->field(9)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
+  EXPECT_EQ(ADDRESS_HOME_STATE,
+            form_structure()->field(16)->Type().GetStorableType());
+  EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
 }
 
 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 405 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