Reduce boxing and unboxing of AutofillFieldType

chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc

Index: chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
index f407ad778e915e9c619532be0d8bb0e4b7db8d14..5e9a4d02d12788b66feef07a5f7dcd6c50590e41 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -163,51 +163,35 @@ TEST_F(AutofillIeToolbarImportTest, TestAutoFillImport) {
   EXPECT_TRUE(ImportCurrentUserProfiles(&profiles, &credit_cards));
   ASSERT_EQ(profiles.size(), 2);
   // The profiles are read in reverse order.
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(NAME_FIRST)),
-            profile1[0].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(NAME_MIDDLE)),
-            profile1[1].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(NAME_LAST)),
-            profile1[2].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(EMAIL_ADDRESS)),
-            profile1[3].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(COMPANY_NAME)),
-            profile1[4].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(PHONE_HOME_COUNTRY_CODE)),
+  EXPECT_EQ(profiles[1].GetFieldText(NAME_FIRST), profile1[0].value);
+  EXPECT_EQ(profiles[1].GetFieldText(NAME_MIDDLE), profile1[1].value);
+  EXPECT_EQ(profiles[1].GetFieldText(NAME_LAST), profile1[2].value);
+  EXPECT_EQ(profiles[1].GetFieldText(EMAIL_ADDRESS), profile1[3].value);
+  EXPECT_EQ(profiles[1].GetFieldText(COMPANY_NAME), profile1[4].value);
+  EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_COUNTRY_CODE),
             profile1[7].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(PHONE_HOME_CITY_CODE)),
-            profile1[6].value);
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(PHONE_HOME_NUMBER)),
-            L"5555555");
-  EXPECT_EQ(profiles[1].GetFieldText(AutofillType(PHONE_HOME_WHOLE_NUMBER)),
-            L"14445555555");
-
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(NAME_FIRST)),
-            profile2[0].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(NAME_LAST)),
-            profile2[1].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(EMAIL_ADDRESS)),
-            profile2[2].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(COMPANY_NAME)),
-            profile2[3].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(PHONE_FAX_COUNTRY_CODE)),
+  EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_CITY_CODE), profile1[6].value);
+  EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_NUMBER), L"5555555");
+  EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_WHOLE_NUMBER), L"14445555555");
+
+  EXPECT_EQ(profiles[0].GetFieldText(NAME_FIRST), profile2[0].value);
+  EXPECT_EQ(profiles[0].GetFieldText(NAME_LAST), profile2[1].value);
+  EXPECT_EQ(profiles[0].GetFieldText(EMAIL_ADDRESS), profile2[2].value);
+  EXPECT_EQ(profiles[0].GetFieldText(COMPANY_NAME), profile2[3].value);
+  EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_COUNTRY_CODE),
             profile2[6].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(PHONE_FAX_CITY_CODE)),
-            profile2[5].value);
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(PHONE_FAX_NUMBER)),
-            L"5556666");
-  EXPECT_EQ(profiles[0].GetFieldText(AutofillType(PHONE_FAX_WHOLE_NUMBER)),
-            L"27775556666");
+  EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_CITY_CODE), profile2[5].value);
+  EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_NUMBER), L"5556666");
+  EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_WHOLE_NUMBER), L"27775556666");
 
   ASSERT_EQ(credit_cards.size(), 1);
-  EXPECT_EQ(credit_cards[0].GetFieldText(AutofillType(CREDIT_CARD_NAME)),
+  EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_NAME),
             credit_card[0].value);
-  EXPECT_EQ(credit_cards[0].GetFieldText(AutofillType(CREDIT_CARD_NUMBER)),
+  EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_NUMBER),
             L"4111111111111111");
-  EXPECT_EQ(credit_cards[0].GetFieldText(AutofillType(CREDIT_CARD_EXP_MONTH)),
+  EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_EXP_MONTH),
             credit_card[2].value);
-  EXPECT_EQ(credit_cards[0].GetFieldText(
-            AutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)),
+  EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR),
             credit_card[3].value);
 
   // Mock password encrypted cc.