Index: chrome/browser/autofill/personal_data_manager_unittest.cc |
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc |
index 7342ca18acf44e36303c22fe56f45cce91201482..de96d3f74508c202eb0d0ab7dee738eda37d5649 100644 |
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc |
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc |
@@ -140,7 +140,7 @@ TEST_F(PersonalDataManagerTest, AddProfile) { |
// New profile with different email. |
AutofillProfile profile1 = profile0; |
profile1.set_guid(base::GenerateGUID()); |
- profile1.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("john@smith.com")); |
+ profile1.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16("john@smith.com")); |
// Add the different profile. This should save as a separate profile. |
// Note that if this same profile was "merged" it would collapse to one |
@@ -191,7 +191,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveProfiles) { |
EXPECT_EQ(0, profile1.Compare(*results1[1])); |
// Update, remove, and add. |
- profile0.SetInfo(NAME_FIRST, ASCIIToUTF16("John")); |
+ profile0.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John")); |
personal_data_->UpdateProfile(profile0); |
personal_data_->RemoveProfile(profile1.guid()); |
personal_data_->AddProfile(profile2); |
@@ -246,7 +246,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) { |
EXPECT_EQ(0, credit_card1.Compare(*results1[1])); |
// Update, remove, and add. |
- credit_card0.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Joe")); |
+ credit_card0.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Joe")); |
personal_data_->UpdateCreditCard(credit_card0); |
personal_data_->RemoveCreditCard(credit_card1.guid()); |
personal_data_->AddCreditCard(credit_card2); |
@@ -479,7 +479,7 @@ TEST_F(PersonalDataManagerTest, Refresh) { |
// open with a previous snapshot of the profiles, and something [e.g. sync] |
// removed a profile from the browser. In this edge case, we will end up |
// in a consistent state by dropping the write). |
- profile2.SetInfo(NAME_FIRST, ASCIIToUTF16("Jo")); |
+ profile2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jo")); |
personal_data_->UpdateProfile(profile0); |
personal_data_->AddProfile(profile1); |
personal_data_->AddProfile(profile2); |
@@ -655,17 +655,17 @@ TEST_F(PersonalDataManagerTest, ImportPhoneNumberSplitAcrossMultipleFields) { |
TEST_F(PersonalDataManagerTest, SetUniqueCreditCardLabels) { |
CreditCard credit_card0; |
- credit_card0.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("John")); |
+ credit_card0.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("John")); |
CreditCard credit_card1; |
- credit_card1.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Paul")); |
+ credit_card1.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Paul")); |
CreditCard credit_card2; |
- credit_card2.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Ringo")); |
+ credit_card2.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Ringo")); |
CreditCard credit_card3; |
- credit_card3.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Other")); |
+ credit_card3.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Other")); |
CreditCard credit_card4; |
- credit_card4.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Ozzy")); |
+ credit_card4.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Ozzy")); |
CreditCard credit_card5; |
- credit_card5.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Dio")); |
+ credit_card5.SetRawInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Dio")); |
// Add the test credit cards to the database. |
personal_data_->AddCreditCard(credit_card0); |
@@ -981,7 +981,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) { |
expected.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); |
values.push_back(ASCIIToUTF16("6502231234")); |
expected.SetMultiInfo(PHONE_HOME_WHOLE_NUMBER, values); |
- expected.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); |
+ expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); |
ASSERT_EQ(1U, results2.size()); |
EXPECT_EQ(0, expected.Compare(*results2[0])); |
} |