| Index: components/autofill/core/browser/webdata/autofill_table_unittest.cc
|
| diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
|
| index b1b873171aa43fd92622e4c6a4c962b5cc500086..f3cf2006b1ac6c27f43c08654179e51bc4bea717 100644
|
| --- a/components/autofill/core/browser/webdata/autofill_table_unittest.cc
|
| +++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
|
| @@ -759,120 +759,6 @@ TEST_F(AutofillTableTest, AutofillProfile) {
|
| EXPECT_FALSE(table_->GetAutofillProfile(billing_profile.guid(), &db_profile));
|
| }
|
|
|
| -TEST_F(AutofillTableTest, AutofillProfileMultiValueNames) {
|
| - AutofillProfile p;
|
| - const base::string16 kJohnDoe(ASCIIToUTF16("John Doe"));
|
| - const base::string16 kJohnPDoe(ASCIIToUTF16("John P. Doe"));
|
| - std::vector<base::string16> set_values;
|
| - set_values.push_back(kJohnDoe);
|
| - set_values.push_back(kJohnPDoe);
|
| - p.SetRawMultiInfo(NAME_FULL, set_values);
|
| -
|
| - EXPECT_TRUE(table_->AddAutofillProfile(p));
|
| -
|
| - AutofillProfile* db_profile;
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Update the values.
|
| - const base::string16 kNoOne(ASCIIToUTF16("No One"));
|
| - set_values[1] = kNoOne;
|
| - p.SetRawMultiInfo(NAME_FULL, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Delete values.
|
| - set_values.clear();
|
| - p.SetRawMultiInfo(NAME_FULL, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - EXPECT_EQ(base::string16(), db_profile->GetRawInfo(NAME_FULL));
|
| - delete db_profile;
|
| -}
|
| -
|
| -TEST_F(AutofillTableTest, AutofillProfileMultiValueEmails) {
|
| - AutofillProfile p;
|
| - const base::string16 kJohnDoe(ASCIIToUTF16("john@doe.com"));
|
| - const base::string16 kJohnPDoe(ASCIIToUTF16("john_p@doe.com"));
|
| - std::vector<base::string16> set_values;
|
| - set_values.push_back(kJohnDoe);
|
| - set_values.push_back(kJohnPDoe);
|
| - p.SetRawMultiInfo(EMAIL_ADDRESS, set_values);
|
| -
|
| - EXPECT_TRUE(table_->AddAutofillProfile(p));
|
| -
|
| - AutofillProfile* db_profile;
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Update the values.
|
| - const base::string16 kNoOne(ASCIIToUTF16("no@one.com"));
|
| - set_values[1] = kNoOne;
|
| - p.SetRawMultiInfo(EMAIL_ADDRESS, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Delete values.
|
| - set_values.clear();
|
| - p.SetRawMultiInfo(EMAIL_ADDRESS, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - EXPECT_EQ(base::string16(), db_profile->GetRawInfo(EMAIL_ADDRESS));
|
| - delete db_profile;
|
| -}
|
| -
|
| -TEST_F(AutofillTableTest, AutofillProfileMultiValuePhone) {
|
| - AutofillProfile p;
|
| - const base::string16 kJohnDoe(ASCIIToUTF16("4151112222"));
|
| - const base::string16 kJohnPDoe(ASCIIToUTF16("4151113333"));
|
| - std::vector<base::string16> set_values;
|
| - set_values.push_back(kJohnDoe);
|
| - set_values.push_back(kJohnPDoe);
|
| - p.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
|
| -
|
| - EXPECT_TRUE(table_->AddAutofillProfile(p));
|
| -
|
| - AutofillProfile* db_profile;
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Update the values.
|
| - const base::string16 kNoOne(ASCIIToUTF16("4151110000"));
|
| - set_values[1] = kNoOne;
|
| - p.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - delete db_profile;
|
| -
|
| - // Delete values.
|
| - set_values.clear();
|
| - p.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
|
| - EXPECT_TRUE(table_->UpdateAutofillProfile(p));
|
| - ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
|
| - EXPECT_EQ(p, *db_profile);
|
| - EXPECT_EQ(0, p.Compare(*db_profile));
|
| - EXPECT_EQ(base::string16(), db_profile->GetRawInfo(EMAIL_ADDRESS));
|
| - delete db_profile;
|
| -}
|
| -
|
| TEST_F(AutofillTableTest, AutofillProfileTrash) {
|
| std::vector<std::string> guids;
|
| table_->GetAutofillProfilesInTrash(&guids);
|
|
|