Skip to content

Commit

Permalink
Remove a deprecated method from AutofillTable.
Browse files Browse the repository at this point in the history 
BUG=240595
TEST=code compiles

Review URL: https://chromiumcodereview.appspot.com/14706009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201710 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
isherman@chromium.org committed May 23, 2013
1 parent b871f06 commit d5cf9b7
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 92 deletions.
4 changes: 2 additions & 2 deletions chrome/browser/sync/profile_sync_service_autofill_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class AutofillTableMock : public AutofillTable {
bool(const std::vector<AutofillEntry>&)); // NOLINT
MOCK_METHOD1(GetAutofillProfiles,
bool(std::vector<AutofillProfile*>*)); // NOLINT
MOCK_METHOD1(UpdateAutofillProfileMulti,
MOCK_METHOD1(UpdateAutofillProfile,
bool(const AutofillProfile&)); // NOLINT
MOCK_METHOD1(AddAutofillProfile,
bool(const AutofillProfile&)); // NOLINT
Expand Down Expand Up @@ -1074,7 +1074,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSyncMergeProfile) {
AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);

EXPECT_CALL(autofill_table_,
UpdateAutofillProfileMulti(MatchProfiles(sync_profile))).
UpdateAutofillProfile(MatchProfiles(sync_profile))).
WillOnce(Return(true));
EXPECT_CALL(*personal_data_manager_, Refresh());
StartSyncService(add_autofill.callback(), false, syncer::AUTOFILL_PROFILE);
Expand Down
3 changes: 1 addition & 2 deletions chrome/browser/webdata/autofill_profile_syncable_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,7 @@ bool AutofillProfileSyncableService::SaveChangesToWebData(
}

for (size_t i = 0; i < bundle.profiles_to_update.size(); i++) {
if (!autofill_table->UpdateAutofillProfileMulti(
*bundle.profiles_to_update[i]))
if (!autofill_table->UpdateAutofillProfile(*bundle.profiles_to_update[i]))
success = false;
}
return success;
Expand Down
35 changes: 0 additions & 35 deletions components/autofill/browser/webdata/autofill_table.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,41 +1027,6 @@ bool AutofillTable::GetAutofillProfiles(
bool AutofillTable::UpdateAutofillProfile(const AutofillProfile& profile) {
DCHECK(base::IsValidGUID(profile.guid()));

// Don't update anything until the trash has been emptied. There may be
// pending modifications to process.
if (!IsAutofillProfilesTrashEmpty())
return true;

AutofillProfile* tmp_profile = NULL;
if (!GetAutofillProfile(profile.guid(), &tmp_profile))
return false;

// Preserve appropriate modification dates by not updating unchanged profiles.
scoped_ptr<AutofillProfile> old_profile(tmp_profile);
if (old_profile->Compare(profile) == 0)
return true;

AutofillProfile new_profile(profile);
std::vector<base::string16> values;

old_profile->GetRawMultiInfo(NAME_FULL, &values);
values[0] = new_profile.GetRawInfo(NAME_FULL);
new_profile.SetRawMultiInfo(NAME_FULL, values);

old_profile->GetRawMultiInfo(EMAIL_ADDRESS, &values);
values[0] = new_profile.GetRawInfo(EMAIL_ADDRESS);
new_profile.SetRawMultiInfo(EMAIL_ADDRESS, values);

old_profile->GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
values[0] = new_profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER);
new_profile.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);

return UpdateAutofillProfileMulti(new_profile);
}

bool AutofillTable::UpdateAutofillProfileMulti(const AutofillProfile& profile) {
DCHECK(base::IsValidGUID(profile.guid()));

// Don't update anything until the trash has been emptied. There may be
// pending modifications to process.
if (!IsAutofillProfilesTrashEmpty())
Expand Down
6 changes: 1 addition & 5 deletions components/autofill/browser/webdata/autofill_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,8 @@ class AutofillTable : public WebDatabaseTable {
// Records a single Autofill profile in the autofill_profiles table.
virtual bool AddAutofillProfile(const AutofillProfile& profile);

// Updates the database values for the specified profile.
// DEPRECATED: Use |UpdateAutofillProfileMulti| instead.
virtual bool UpdateAutofillProfile(const AutofillProfile& profile);

// Updates the database values for the specified profile. Mulit-value aware.
virtual bool UpdateAutofillProfileMulti(const AutofillProfile& profile);
virtual bool UpdateAutofillProfile(const AutofillProfile& profile);

// Removes a row from the autofill_profiles table. |guid| is the identifier
// of the profile to remove.
Expand Down
59 changes: 13 additions & 46 deletions components/autofill/browser/webdata/autofill_table_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ TEST_F(AutofillTableTest, AutofillProfile) {
// Update the 'Billing' profile, name only.
billing_profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
Time pre_modification_time = Time::Now();
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(billing_profile));
EXPECT_TRUE(table_->UpdateAutofillProfile(billing_profile));
Time post_modification_time = Time::Now();
ASSERT_TRUE(table_->GetAutofillProfile(billing_profile.guid(), &db_profile));
EXPECT_EQ(billing_profile, *db_profile);
Expand Down Expand Up @@ -600,7 +600,7 @@ TEST_F(AutofillTableTest, AutofillProfile) {
billing_profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
ASCIIToUTF16("18181230000"));
Time pre_modification_time_2 = Time::Now();
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(billing_profile));
EXPECT_TRUE(table_->UpdateAutofillProfile(billing_profile));
Time post_modification_time_2 = Time::Now();
ASSERT_TRUE(table_->GetAutofillProfile(billing_profile.guid(), &db_profile));
EXPECT_EQ(billing_profile, *db_profile);
Expand Down Expand Up @@ -643,7 +643,7 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValueNames) {
const base::string16 kNoOne(ASCIIToUTF16("No One"));
set_values[1] = kNoOne;
p.SetRawMultiInfo(NAME_FULL, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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));
Expand All @@ -652,47 +652,14 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValueNames) {
// Delete values.
set_values.clear();
p.SetRawMultiInfo(NAME_FULL, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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, AutofillProfileSingleValue) {
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;

const base::string16 kNoOne(ASCIIToUTF16("No One"));
set_values.resize(1);
set_values[0] = kNoOne;
p.SetRawMultiInfo(NAME_FULL, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfile(p));
ASSERT_TRUE(table_->GetAutofillProfile(p.guid(), &db_profile));
EXPECT_EQ(p.PrimaryValue(), db_profile->PrimaryValue());
EXPECT_EQ(p.guid(), db_profile->guid());
EXPECT_NE(0, p.Compare(*db_profile));
db_profile->GetRawMultiInfo(NAME_FULL, &set_values);
ASSERT_EQ(2UL, set_values.size());
EXPECT_EQ(kNoOne, set_values[0]);
EXPECT_EQ(kJohnPDoe, set_values[1]);
delete db_profile;
}

TEST_F(AutofillTableTest, AutofillProfileMultiValueEmails) {
AutofillProfile p;
const base::string16 kJohnDoe(ASCIIToUTF16("john@doe.com"));
Expand All @@ -714,7 +681,7 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValueEmails) {
const base::string16 kNoOne(ASCIIToUTF16("no@one.com"));
set_values[1] = kNoOne;
p.SetRawMultiInfo(EMAIL_ADDRESS, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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));
Expand All @@ -723,7 +690,7 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValueEmails) {
// Delete values.
set_values.clear();
p.SetRawMultiInfo(EMAIL_ADDRESS, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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));
Expand Down Expand Up @@ -752,7 +719,7 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValuePhone) {
const base::string16 kNoOne(ASCIIToUTF16("4151110000"));
set_values[1] = kNoOne;
p.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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));
Expand All @@ -761,7 +728,7 @@ TEST_F(AutofillTableTest, AutofillProfileMultiValuePhone) {
// Delete values.
set_values.clear();
p.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, set_values);
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(p));
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));
Expand Down Expand Up @@ -827,7 +794,7 @@ TEST_F(AutofillTableTest, AutofillProfileTrashInteraction) {
// trash and in the profiles table simultaneously.
EXPECT_TRUE(table_->AddAutofillGUIDToTrash(profile.guid()));
profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
EXPECT_TRUE(table_->UpdateAutofillProfileMulti(profile));
EXPECT_TRUE(table_->UpdateAutofillProfile(profile));
AutofillProfile* updated_profile = NULL;
EXPECT_TRUE(table_->GetAutofillProfile(profile.guid(), &updated_profile));
ASSERT_NE(static_cast<AutofillProfile*>(NULL), added_profile);
Expand Down Expand Up @@ -979,7 +946,7 @@ TEST_F(AutofillTableTest, UpdateAutofillProfile) {
// Now, update the profile and save the update to the database.
// The modification date should change to reflect the update.
profile.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16("js@smith.xyz"));
table_->UpdateAutofillProfileMulti(profile);
table_->UpdateAutofillProfile(profile);

// Get the profile.
ASSERT_TRUE(table_->GetAutofillProfile(profile.guid(), &tmp_profile));
Expand All @@ -1001,9 +968,9 @@ TEST_F(AutofillTableTest, UpdateAutofillProfile) {
s_mock_modification_date.BindInt64(0, mock_modification_date);
ASSERT_TRUE(s_mock_modification_date.Run());

// Finally, call into |UpdateAutofillProfileMulti()| without changing the
// Finally, call into |UpdateAutofillProfile()| without changing the
// profile. The modification date should not change.
table_->UpdateAutofillProfileMulti(profile);
table_->UpdateAutofillProfile(profile);

// Get the profile.
ASSERT_TRUE(table_->GetAutofillProfile(profile.guid(), &tmp_profile));
Expand Down Expand Up @@ -1129,7 +1096,7 @@ TEST_F(AutofillTableTest, UpdateProfileOriginOnly) {
// Now, update just the profile's origin and save the update to the database.
// The modification date should change to reflect the update.
profile.set_origin("https://www.example.com/");
table_->UpdateAutofillProfileMulti(profile);
table_->UpdateAutofillProfile(profile);

// Get the profile.
ASSERT_TRUE(table_->GetAutofillProfile(profile.guid(), &tmp_profile));
Expand Down
3 changes: 1 addition & 2 deletions components/autofill/browser/webdata/autofill_webdata_backend_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ WebDatabase::State AutofillWebDataBackendImpl::UpdateAutofillProfile(
}
scoped_ptr<AutofillProfile> scoped_profile(original_profile);

if (!AutofillTable::FromWebDatabase(db)->UpdateAutofillProfileMulti(
profile)) {
if (!AutofillTable::FromWebDatabase(db)->UpdateAutofillProfile(profile)) {
NOTREACHED();
return WebDatabase::COMMIT_NEEDED;
}
Expand Down

0 comments on commit d5cf9b7

Please sign in to comment.