diff options
author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 06:26:29 +0000 |
---|---|---|
committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 06:26:29 +0000 |
commit | 1ffe8e993e3052271b9a60f303bcbb8f3104d80b (patch) | |
tree | b5b01c65813c53fa4279907baa8aa8f1eb5d5480 /chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc | |
parent | daa826fee9fa5a59aa7b4bd82a1c6f2f4ae4a636 (diff) | |
download | chromium_src-1ffe8e993e3052271b9a60f303bcbb8f3104d80b.zip chromium_src-1ffe8e993e3052271b9a60f303bcbb8f3104d80b.tar.gz chromium_src-1ffe8e993e3052271b9a60f303bcbb8f3104d80b.tar.bz2 |
Reduce boxing and unboxing of AutofillFieldType
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/6673079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc')
-rw-r--r-- | chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc | 60 |
1 files changed, 22 insertions, 38 deletions
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 f407ad7..5e9a4d0 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. |