Index: components/browser_sync/profile_sync_service_autofill_unittest.cc |
diff --git a/components/browser_sync/profile_sync_service_autofill_unittest.cc b/components/browser_sync/profile_sync_service_autofill_unittest.cc |
index f60c2afd61b72e78862c4b4a59fb691ad7533846..fbee53589b913552ae38b43a40446a6ac0e2d2b1 100644 |
--- a/components/browser_sync/profile_sync_service_autofill_unittest.cc |
+++ b/components/browser_sync/profile_sync_service_autofill_unittest.cc |
@@ -90,7 +90,7 @@ using testing::_; |
using testing::DoAll; |
using testing::ElementsAre; |
using testing::Not; |
-using testing::SetArgumentPointee; |
+using testing::SetArgPointee; |
using testing::Return; |
namespace browser_sync { |
@@ -842,7 +842,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeEntriesEmptySync) { |
std::vector<AutofillEntry> entries; |
entries.push_back(MakeAutofillEntry("foo", "bar", 1)); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(entries), Return(true))); |
SetIdleChangeProcessorExpectations(); |
CreateRootHelper create_root(this, AUTOFILL); |
EXPECT_CALL(personal_data_manager(), Refresh()); |
@@ -889,7 +889,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeWithDuplicatesEmptySync) { |
entries.push_back(MakeAutofillEntry("dup", "", 2)); |
entries.push_back(MakeAutofillEntry("dup", "", 3)); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(entries), Return(true))); |
SetIdleChangeProcessorExpectations(); |
CreateRootHelper create_root(this, AUTOFILL); |
EXPECT_CALL(personal_data_manager(), Refresh()); |
@@ -909,7 +909,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSyncNoMerge) { |
native_entries.push_back(native_entry); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true))); |
std::vector<AutofillEntry> sync_entries; |
sync_entries.push_back(sync_entry); |
@@ -951,7 +951,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSyncNoMerge_NullTerminated) { |
native_entries.push_back(native_entry1); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true))); |
std::vector<AutofillEntry> sync_entries; |
sync_entries.push_back(sync_entry0); |
@@ -994,7 +994,7 @@ TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSyncMergeEntry) { |
std::vector<AutofillEntry> native_entries; |
native_entries.push_back(native_entry); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true))); |
std::vector<AutofillEntry> sync_entries; |
sync_entries.push_back(sync_entry); |
@@ -1364,8 +1364,8 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeAddEntry) { |
AutofillEntry added_entry(MakeAutofillEntry("added", "entry", 1)); |
EXPECT_CALL(autofill_table(), GetAutofillTimestamps(_, _, _, _)) |
- .WillOnce(DoAll(SetArgumentPointee<2>(added_entry.date_created()), |
- SetArgumentPointee<3>(added_entry.date_last_used()), |
+ .WillOnce(DoAll(SetArgPointee<2>(added_entry.date_created()), |
+ SetArgPointee<3>(added_entry.date_last_used()), |
Return(true))); |
AutofillChangeList changes; |
@@ -1412,7 +1412,7 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeUpdateEntry) { |
original_entries.push_back(original_entry); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true))); |
EXPECT_CALL(personal_data_manager(), Refresh()); |
CreateRootHelper create_root(this, AUTOFILL); |
StartSyncService(create_root.callback(), false, AUTOFILL); |
@@ -1421,8 +1421,8 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeUpdateEntry) { |
AutofillEntry updated_entry(MakeAutofillEntry("my", "entry", 1, 2)); |
EXPECT_CALL(autofill_table(), GetAutofillTimestamps(_, _, _, _)) |
- .WillOnce(DoAll(SetArgumentPointee<2>(updated_entry.date_created()), |
- SetArgumentPointee<3>(updated_entry.date_last_used()), |
+ .WillOnce(DoAll(SetArgPointee<2>(updated_entry.date_created()), |
+ SetArgPointee<3>(updated_entry.date_last_used()), |
Return(true))); |
AutofillChangeList changes; |
@@ -1444,7 +1444,7 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeRemoveEntry) { |
original_entries.push_back(original_entry); |
EXPECT_CALL(autofill_table(), GetAllAutofillEntries(_)) |
- .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true))); |
EXPECT_CALL(personal_data_manager(), Refresh()); |
CreateRootHelper create_root(this, AUTOFILL); |
StartSyncService(create_root.callback(), false, AUTOFILL); |