| Index: chrome/browser/autofill/autofill_browsertest.cc
|
| diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
|
| index 4a4edba2fda5b98cd3d993b0a732f7fc9fd34e91..d1d3f32bbcc082ee3b5e9f2d9d5148ea61bb7890 100644
|
| --- a/chrome/browser/autofill/autofill_browsertest.cc
|
| +++ b/chrome/browser/autofill/autofill_browsertest.cc
|
| @@ -892,59 +892,98 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillAfterTranslate) {
|
| IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
|
| std::vector<AutofillProfile> profiles;
|
| AutofillProfile profile1;
|
| - profile1.SetInfo(NAME_FIRST, WideToUTF16(L"\u0623\u0648\u0628\u0627\u0645\u0627 \u064a\u0639\u062a\u0630\u0631 \u0647\u0627\u062a\u0641\u064a\u0627 \u0644\u0645\u0648\u0638\u0641\u0629 \u0633\u0648\u062f\u0627\u0621 \u0627\u0633\u062a\u0642\u0627\u0644\u062a \u0628\u0633\u0628\u0628 \u062a\u0635\u0631\u064a\u062d\u0627\u062a \u0645\u062c\u062a\u0632\u0623\u0629"));
|
| - profile1.SetInfo(NAME_MIDDLE, WideToUTF16(L"BANK\xcBERF\xc4LLE"));
|
| - profile1.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"\uacbd\uc81c \ub274\uc2a4 \ub354\ubcf4\uae30@google.com"));
|
| - profile1.SetInfo(ADDRESS_HOME_LINE1, WideToUTF16(L"\uad6d\uc815\uc6d0\xb7\uac80\ucc30, \ub178\ubb34\ud604\uc815\ubd80 \ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 \uc778\uc0ac\ub4e4 \uc870\uc0ac"));
|
| - profile1.SetInfo(ADDRESS_HOME_CITY, WideToUTF16(L"\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5\u898f\u7ba1\u5c0e\u904a"));
|
| - profile1.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676"));
|
| - profile1.SetInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000"));
|
| - profile1.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India"));
|
| + profile1.SetRawInfo(NAME_FIRST,
|
| + WideToUTF16(L"\u0623\u0648\u0628\u0627\u0645\u0627 "
|
| + L"\u064a\u0639\u062a\u0630\u0631 "
|
| + L"\u0647\u0627\u062a\u0641\u064a\u0627 "
|
| + L"\u0644\u0645\u0648\u0638\u0641\u0629 "
|
| + L"\u0633\u0648\u062f\u0627\u0621 "
|
| + L"\u0627\u0633\u062a\u0642\u0627\u0644\u062a "
|
| + L"\u0628\u0633\u0628\u0628 "
|
| + L"\u062a\u0635\u0631\u064a\u062d\u0627\u062a "
|
| + L"\u0645\u062c\u062a\u0632\u0623\u0629"));
|
| + profile1.SetRawInfo(NAME_MIDDLE, WideToUTF16(L"BANK\xcBERF\xc4LLE"));
|
| + profile1.SetRawInfo(EMAIL_ADDRESS,
|
| + WideToUTF16(L"\uacbd\uc81c \ub274\uc2a4 "
|
| + L"\ub354\ubcf4\uae30@google.com"));
|
| + profile1.SetRawInfo(ADDRESS_HOME_LINE1,
|
| + WideToUTF16(L"\uad6d\uc815\uc6d0\xb7\uac80\ucc30, "
|
| + L"\ub178\ubb34\ud604\uc815\ubd80 "
|
| + L"\ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 "
|
| + L"\uc778\uc0ac\ub4e4 \uc870\uc0ac"));
|
| + profile1.SetRawInfo(ADDRESS_HOME_CITY,
|
| + WideToUTF16(L"\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5"
|
| + L"\u898f\u7ba1\u5c0e\u904a"));
|
| + profile1.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676"));
|
| + profile1.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000"));
|
| + profile1.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India"));
|
| profiles.push_back(profile1);
|
|
|
| AutofillProfile profile2;
|
| - profile2.SetInfo(NAME_FIRST, WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7"));
|
| - profile2.SetInfo(NAME_LAST, WideToUTF16(L"aguantó"));
|
| - profile2.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
|
| + profile2.SetRawInfo(NAME_FIRST,
|
| + WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a "
|
| + L"\u677e\u9690\u9547\u4ead\u67ab\u516c"
|
| + L"\u8def1915\u53f7"));
|
| + profile2.SetRawInfo(NAME_LAST, WideToUTF16(L"aguantó"));
|
| + profile2.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
|
| profiles.push_back(profile2);
|
|
|
| AutofillProfile profile3;
|
| - profile3.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"sue@example.com"));
|
| - profile3.SetInfo(COMPANY_NAME, WideToUTF16(L"Company X"));
|
| + profile3.SetRawInfo(EMAIL_ADDRESS, WideToUTF16(L"sue@example.com"));
|
| + profile3.SetRawInfo(COMPANY_NAME, WideToUTF16(L"Company X"));
|
| profiles.push_back(profile3);
|
|
|
| AutofillProfile profile4;
|
| - profile4.SetInfo(NAME_FIRST, WideToUTF16(L"Joe 3254"));
|
| - profile4.SetInfo(NAME_LAST, WideToUTF16(L"\u8bb0\u8d262\u5e74\u591a"));
|
| - profile4.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"\uff08\u90ae\u7f16\uff1a201504\uff09"));
|
| - profile4.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"télévision@example.com"));
|
| - profile4.SetInfo(COMPANY_NAME, WideToUTF16(L"\u0907\u0932\u0947\u0915\u093f\u091f\u094d\u0930\u0928\u093f\u0915\u094d\u0938, \u0905\u092a\u094b\u0932\u094b \u091f\u093e\u092f\u0930\u094d\u0938 \u0906\u0926\u093f"));
|
| + profile4.SetRawInfo(NAME_FIRST, WideToUTF16(L"Joe 3254"));
|
| + profile4.SetRawInfo(NAME_LAST, WideToUTF16(L"\u8bb0\u8d262\u5e74\u591a"));
|
| + profile4.SetRawInfo(ADDRESS_HOME_ZIP,
|
| + WideToUTF16(L"\uff08\u90ae\u7f16\uff1a201504\uff09"));
|
| + profile4.SetRawInfo(EMAIL_ADDRESS, WideToUTF16(L"télévision@example.com"));
|
| + profile4.SetRawInfo(COMPANY_NAME,
|
| + WideToUTF16(L"\u0907\u0932\u0947\u0915\u093f\u091f\u094d"
|
| + L"\u0930\u0928\u093f\u0915\u094d\u0938, "
|
| + L"\u0905\u092a\u094b\u0932\u094b "
|
| + L"\u091f\u093e\u092f\u0930\u094d\u0938 "
|
| + L"\u0906\u0926\u093f"));
|
| profiles.push_back(profile4);
|
|
|
| AutofillProfile profile5;
|
| - profile5.SetInfo(NAME_FIRST, WideToUTF16(L"Larry"));
|
| - profile5.SetInfo(NAME_LAST, WideToUTF16(L"\u0938\u094d\u091f\u093e\u0902\u092a \u0921\u094d\u092f\u0942\u091f\u0940"));
|
| - profile5.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"111111111111110000GOOGLE"));
|
| - profile5.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"page@000000.com"));
|
| - profile5.SetInfo(COMPANY_NAME, WideToUTF16(L"Google"));
|
| + profile5.SetRawInfo(NAME_FIRST, WideToUTF16(L"Larry"));
|
| + profile5.SetRawInfo(NAME_LAST,
|
| + WideToUTF16(L"\u0938\u094d\u091f\u093e\u0902\u092a "
|
| + L"\u0921\u094d\u092f\u0942\u091f\u0940"));
|
| + profile5.SetRawInfo(ADDRESS_HOME_ZIP,
|
| + WideToUTF16(L"111111111111110000GOOGLE"));
|
| + profile5.SetRawInfo(EMAIL_ADDRESS, WideToUTF16(L"page@000000.com"));
|
| + profile5.SetRawInfo(COMPANY_NAME, WideToUTF16(L"Google"));
|
| profiles.push_back(profile5);
|
|
|
| AutofillProfile profile6;
|
| - profile6.SetInfo(NAME_FIRST, WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7"));
|
| - profile6.SetInfo(NAME_LAST, WideToUTF16(L"\u0646\u062c\u0627\u0645\u064a\u0646\u0627 \u062f\u0639\u0645\u0647\u0627 \u0644\u0644\u0631\u0626\u064a\u0633 \u0627\u0644\u0633\u0648\u062f\u0627\u0646\u064a \u0639\u0645\u0631 \u0627\u0644\u0628\u0634\u064a\u0631"));
|
| - profile6.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
|
| + profile6.SetRawInfo(NAME_FIRST,
|
| + WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a "
|
| + L"\u677e\u9690\u9547\u4ead\u67ab\u516c"
|
| + L"\u8def1915\u53f7"));
|
| + profile6.SetRawInfo(NAME_LAST,
|
| + WideToUTF16(L"\u0646\u062c\u0627\u0645\u064a\u0646\u0627 "
|
| + L"\u062f\u0639\u0645\u0647\u0627 "
|
| + L"\u0644\u0644\u0631\u0626\u064a\u0633 "
|
| + L"\u0627\u0644\u0633\u0648\u062f\u0627\u0646"
|
| + L"\u064a \u0639\u0645\u0631 "
|
| + L"\u0627\u0644\u0628\u0634\u064a\u0631"));
|
| + profile6.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
|
| profiles.push_back(profile6);
|
|
|
| AutofillProfile profile7;
|
| - profile7.SetInfo(NAME_FIRST, WideToUTF16(L"&$%$$$ TESTO *&*&^&^& MOKO"));
|
| - profile7.SetInfo(NAME_MIDDLE, WideToUTF16(L"WOHOOOO$$$$$$$$****"));
|
| - profile7.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"yuvu@example.com"));
|
| - profile7.SetInfo(ADDRESS_HOME_LINE1, WideToUTF16(L"34544, anderson ST.(120230)"));
|
| - profile7.SetInfo(ADDRESS_HOME_CITY, WideToUTF16(L"Sunnyvale"));
|
| - profile7.SetInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
|
| - profile7.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086"));
|
| - profile7.SetInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565"));
|
| - profile7.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
|
| + profile7.SetRawInfo(NAME_FIRST, WideToUTF16(L"&$%$$$ TESTO *&*&^&^& MOKO"));
|
| + profile7.SetRawInfo(NAME_MIDDLE, WideToUTF16(L"WOHOOOO$$$$$$$$****"));
|
| + profile7.SetRawInfo(EMAIL_ADDRESS, WideToUTF16(L"yuvu@example.com"));
|
| + profile7.SetRawInfo(ADDRESS_HOME_LINE1,
|
| + WideToUTF16(L"34544, anderson ST.(120230)"));
|
| + profile7.SetRawInfo(ADDRESS_HOME_CITY, WideToUTF16(L"Sunnyvale"));
|
| + profile7.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
|
| + profile7.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086"));
|
| + profile7.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565"));
|
| + profile7.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
|
| profiles.push_back(profile7);
|
|
|
| SetProfiles(&profiles);
|
| @@ -954,31 +993,48 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
|
|
|
| std::vector<CreditCard> cards;
|
| CreditCard card1;
|
| - card1.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u751f\u6d3b\u5f88\u6709\u89c4\u5f8b \u4ee5\u73a9\u4e3a\u4e3b"));
|
| - card1.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"6011111111111117"));
|
| - card1.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"12"));
|
| - card1.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2011"));
|
| + card1.SetRawInfo(CREDIT_CARD_NAME,
|
| + WideToUTF16(L"\u751f\u6d3b\u5f88\u6709\u89c4\u5f8b "
|
| + L"\u4ee5\u73a9\u4e3a\u4e3b"));
|
| + card1.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"6011111111111117"));
|
| + card1.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"12"));
|
| + card1.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2011"));
|
| cards.push_back(card1);
|
|
|
| CreditCard card2;
|
| - card2.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"John Williams"));
|
| - card2.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"WokoAwesome12345"));
|
| - card2.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
|
| - card2.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
|
| + card2.SetRawInfo(CREDIT_CARD_NAME, WideToUTF16(L"John Williams"));
|
| + card2.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"WokoAwesome12345"));
|
| + card2.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
|
| + card2.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
|
| cards.push_back(card2);
|
|
|
| CreditCard card3;
|
| - card3.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u0623\u062d\u0645\u062f\u064a \u0646\u062c\u0627\u062f \u0644\u0645\u062d\u0627\u0648\u0644\u0647 \u0627\u063a\u062a\u064a\u0627\u0644 \u0641\u064a \u0645\u062f\u064a\u0646\u0629 \u0647\u0645\u062f\u0627\u0646 "));
|
| - card3.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"\u092a\u0941\u0928\u0930\u094d\u091c\u0940\u0935\u093f\u0924 \u0939\u094b\u0917\u093e \u0928\u093e\u0932\u0902\u0926\u093e"));
|
| - card3.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
|
| - card3.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
|
| + card3.SetRawInfo(CREDIT_CARD_NAME,
|
| + WideToUTF16(L"\u0623\u062d\u0645\u062f\u064a "
|
| + L"\u0646\u062c\u0627\u062f "
|
| + L"\u0644\u0645\u062d\u0627\u0648\u0644\u0647 "
|
| + L"\u0627\u063a\u062a\u064a\u0627\u0644 "
|
| + L"\u0641\u064a \u0645\u062f\u064a\u0646\u0629 "
|
| + L"\u0647\u0645\u062f\u0627\u0646 "));
|
| + card3.SetRawInfo(CREDIT_CARD_NUMBER,
|
| + WideToUTF16(L"\u092a\u0941\u0928\u0930\u094d\u091c\u0940"
|
| + L"\u0935\u093f\u0924 \u0939\u094b\u0917\u093e "
|
| + L"\u0928\u093e\u0932\u0902\u0926\u093e"));
|
| + card3.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
|
| + card3.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
|
| cards.push_back(card3);
|
|
|
| CreditCard card4;
|
| - card4.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u039d\u03ad\u03b5\u03c2 \u03c3\u03c5\u03b3\u03c7\u03c9\u03bd\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae\u03c3\u03b5\u03b9\u03c2"));
|
| - card4.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"00000000000000000000000"));
|
| - card4.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"01"));
|
| - card4.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2016"));
|
| + card4.SetRawInfo(CREDIT_CARD_NAME,
|
| + WideToUTF16(L"\u039d\u03ad\u03b5\u03c2 "
|
| + L"\u03c3\u03c5\u03b3\u03c7\u03c9\u03bd\u03b5"
|
| + L"\u03cd\u03c3\u03b5\u03b9\u03c2 "
|
| + L"\u03ba\u03b1\u03b9 "
|
| + L"\u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae"
|
| + L"\u03c3\u03b5\u03b9\u03c2"));
|
| + card4.SetRawInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"00000000000000000000000"));
|
| + card4.SetRawInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"01"));
|
| + card4.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2016"));
|
| cards.push_back(card4);
|
|
|
| SetCards(&cards);
|
| @@ -994,27 +1050,29 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
|
| IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) {
|
| // First try profiles with invalid ZIP input.
|
| AutofillProfile without_invalid;
|
| - without_invalid.SetInfo(NAME_FIRST, ASCIIToUTF16("Will"));
|
| - without_invalid.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale"));
|
| - without_invalid.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| - without_invalid.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip"));
|
| - without_invalid.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
|
| + without_invalid.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Will"));
|
| + without_invalid.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale"));
|
| + without_invalid.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| + without_invalid.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip"));
|
| + without_invalid.SetRawInfo(ADDRESS_HOME_COUNTRY,
|
| + ASCIIToUTF16("United States"));
|
|
|
| AutofillProfile with_invalid = without_invalid;
|
| - with_invalid.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("Invalid_Phone_Number"));
|
| + with_invalid.SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
|
| + ASCIIToUTF16("Invalid_Phone_Number"));
|
| SetProfile(with_invalid);
|
|
|
| ASSERT_EQ(1u, personal_data_manager()->profiles().size());
|
| AutofillProfile profile = *personal_data_manager()->profiles()[0];
|
| - ASSERT_NE(without_invalid.GetInfo(PHONE_HOME_WHOLE_NUMBER),
|
| - profile.GetInfo(PHONE_HOME_WHOLE_NUMBER));
|
| + ASSERT_NE(without_invalid.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
|
| + profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER));
|
| }
|
|
|
| // Test invalid credit card numbers typed in prefs should be saved as-is.
|
| // TODO(isherman): rewrite as WebUI test?
|
| IN_PROC_BROWSER_TEST_F(AutofillTest, PrefsStringSavedAsIs) {
|
| CreditCard card;
|
| - card.SetInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("Not_0123-5Checked"));
|
| + card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("Not_0123-5Checked"));
|
| SetCard(card);
|
|
|
| ASSERT_EQ(1u, personal_data_manager()->credit_cards().size());
|
| @@ -1045,10 +1103,10 @@ IN_PROC_BROWSER_TEST_F(AutofillTest,
|
| SubmitCreditCard("Jane Doe", "4417-1234-5678-9113", "10", "2013");
|
|
|
| ASSERT_EQ(2u, personal_data_manager()->credit_cards().size());
|
| - string16 cc1 = personal_data_manager()->credit_cards()[0]->GetInfo(
|
| + string16 cc1 = personal_data_manager()->credit_cards()[0]->GetRawInfo(
|
| CREDIT_CARD_NUMBER);
|
| ASSERT_TRUE(CreditCard::IsValidCreditCardNumber(cc1));
|
| - string16 cc2 = personal_data_manager()->credit_cards()[1]->GetInfo(
|
| + string16 cc2 = personal_data_manager()->credit_cards()[1]->GetRawInfo(
|
| CREDIT_CARD_NUMBER);
|
| ASSERT_TRUE(CreditCard::IsValidCreditCardNumber(cc2));
|
| }
|
| @@ -1119,13 +1177,13 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_ComparePhoneNumbers) {
|
| ASSERT_TRUE(test_server()->Start());
|
|
|
| AutofillProfile profile;
|
| - profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| - profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| - profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
|
| - profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
|
| - profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| - profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
|
| - profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1-408-555-4567"));
|
| + profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| + profile.SetRawInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| + profile.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
|
| + profile.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
|
| + profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| + profile.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
|
| + profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1-408-555-4567"));
|
| SetProfile(profile);
|
|
|
| GURL url = test_server()->GetURL("files/autofill/form_phones.html");
|
| @@ -1209,10 +1267,10 @@ IN_PROC_BROWSER_TEST_F(AutofillTest,
|
|
|
| ASSERT_EQ(2u, personal_data_manager()->profiles().size());
|
| ASSERT_EQ(ASCIIToUTF16("(408) 871-4567"),
|
| - personal_data_manager()->profiles()[0]->GetInfo(
|
| + personal_data_manager()->profiles()[0]->GetRawInfo(
|
| PHONE_HOME_WHOLE_NUMBER));
|
| ASSERT_EQ(ASCIIToUTF16("+49 40/808179000"),
|
| - personal_data_manager()->profiles()[1]->GetInfo(
|
| + personal_data_manager()->profiles()[1]->GetRawInfo(
|
| PHONE_HOME_WHOLE_NUMBER));
|
| }
|
|
|
| @@ -1234,8 +1292,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AppendCountryCodeForAggregatedPhones) {
|
| FillFormAndSubmit("autofill_test_form.html", data);
|
|
|
| ASSERT_EQ(1u, personal_data_manager()->profiles().size());
|
| - string16 phone =
|
| - personal_data_manager()->profiles()[0]->GetInfo(PHONE_HOME_WHOLE_NUMBER);
|
| + string16 phone = personal_data_manager()->profiles()[0]->GetRawInfo(
|
| + PHONE_HOME_WHOLE_NUMBER);
|
| ASSERT_TRUE(StartsWith(phone, ASCIIToUTF16("+49"), true));
|
| }
|
|
|
| @@ -1270,15 +1328,15 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_NoAutofillForReadOnlyFields) {
|
| std::string addr_line1("1234 H St.");
|
|
|
| AutofillProfile profile;
|
| - profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| - profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| - profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("bsmith@gmail.com"));
|
| - profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16(addr_line1));
|
| - profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
|
| - profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| - profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
|
| - profile.SetInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
|
| - profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("408-871-4567"));
|
| + profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| + profile.SetRawInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| + profile.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16("bsmith@gmail.com"));
|
| + profile.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16(addr_line1));
|
| + profile.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
|
| + profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
|
| + profile.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
|
| + profile.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
|
| + profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("408-871-4567"));
|
| SetProfile(profile);
|
|
|
| GURL url = test_server()->GetURL("files/autofill/read_only_field_test.html");
|
| @@ -1365,10 +1423,10 @@ IN_PROC_BROWSER_TEST_F(AutofillTest,
|
| std::string email("bsmith@gmail.com");
|
|
|
| AutofillProfile profile;
|
| - profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| - profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| - profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
|
| - profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
|
| + profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
|
| + profile.SetRawInfo(NAME_LAST, ASCIIToUTF16("Smith"));
|
| + profile.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
|
| + profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
|
| SetProfile(profile);
|
|
|
| GURL url = test_server()->GetURL(
|
| @@ -1435,13 +1493,13 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) {
|
| streets[base::RandInt(0, streets.size() - 1)]);
|
| string16 city = ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]);
|
| string16 zip(base::IntToString16(base::RandInt(0, 10000)));
|
| - profile.SetInfo(NAME_FIRST, name);
|
| - profile.SetInfo(EMAIL_ADDRESS, email);
|
| - profile.SetInfo(ADDRESS_HOME_LINE1, street);
|
| - profile.SetInfo(ADDRESS_HOME_CITY, city);
|
| - profile.SetInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
|
| - profile.SetInfo(ADDRESS_HOME_ZIP, zip);
|
| - profile.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
|
| + profile.SetRawInfo(NAME_FIRST, name);
|
| + profile.SetRawInfo(EMAIL_ADDRESS, email);
|
| + profile.SetRawInfo(ADDRESS_HOME_LINE1, street);
|
| + profile.SetRawInfo(ADDRESS_HOME_CITY, city);
|
| + profile.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
|
| + profile.SetRawInfo(ADDRESS_HOME_ZIP, zip);
|
| + profile.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
|
| profiles.push_back(profile);
|
| }
|
| SetProfiles(&profiles);
|
|
|