Replace gmock's deprecated SetArgumentPointee with SetArgPointee.

components/browser_sync/profile_sync_service_typed_url_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 30 matching lines @@
 #include "components/sync/syncable/write_transaction.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using history::HistoryBackend;
 using history::HistoryBackendNotifier;
 using history::TypedUrlSyncableService;
 using testing::DoAll;
 using testing::Return;
-using testing::SetArgumentPointee;
+using testing::SetArgPointee;
 using testing::_;
 
 namespace browser_sync {
 
 namespace {
 
 const char kDummySavingBrowserHistoryDisabled[] = "dummyPref";
 
 // Visits with this timestamp are treated as expired.
 static const int EXPIRED_VISIT = -1;
@@ skipping 350 matching lines @@
   ASSERT_EQ(0, syncable_service->GetErrorPercentage());
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeEmptySync) {
   history::URLRows entries;
   history::VisitVector visits;
   entries.push_back(
       MakeTypedUrlEntry("http://foo.com", "bar", 2, 15, false, &visits));
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(DoAll(SetArgumentPointee<2>(visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(visits), Return(true)));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   TypedUrlSyncableService* syncable_service =
       StartSyncService(create_root.callback());
   history::URLRows sync_entries;
   GetTypedUrlsFromSyncDB(&sync_entries);
   ASSERT_EQ(1U, sync_entries.size());
   EXPECT_TRUE(URLsEqual(entries[0], sync_entries[0]));
   ASSERT_EQ(0, syncable_service->GetErrorPercentage());
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeErrorReadingVisits) {
   history::URLRows entries;
   history::VisitVector visits;
   history::URLRow native_entry1(
       MakeTypedUrlEntry("http://foo.com", "bar", 2, 15, false, &visits));
   history::URLRow native_entry2(
       MakeTypedUrlEntry("http://foo2.com", "bar", 3, 15, false, &visits));
   entries.push_back(native_entry1);
   entries.push_back(native_entry2);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(entries), Return(true)));
   // Return an error from GetMostRecentVisitsForURL() for the second URL.
   EXPECT_CALL((history_backend()),
               GetMostRecentVisitsForURL(native_entry1.id(), _, _))
       .WillRepeatedly(Return(true));
   EXPECT_CALL((history_backend()),
               GetMostRecentVisitsForURL(native_entry2.id(), _, _))
       .WillRepeatedly(Return(false));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
   history::URLRows sync_entries;
   GetTypedUrlsFromSyncDB(&sync_entries);
   ASSERT_EQ(1U, sync_entries.size());
   EXPECT_TRUE(URLsEqual(native_entry1, sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeWithBlankEmptySync) {
   std::vector<history::URLRow> entries;
   history::VisitVector visits;
   // Add an empty URL.
   entries.push_back(MakeTypedUrlEntry("", "bar", 2, 15, false, &visits));
   entries.push_back(
       MakeTypedUrlEntry("http://foo.com", "bar", 2, 15, false, &visits));
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(DoAll(SetArgumentPointee<2>(visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(visits), Return(true)));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
   std::vector<history::URLRow> sync_entries;
   GetTypedUrlsFromSyncDB(&sync_entries);
   // The empty URL should be ignored.
   ASSERT_EQ(1U, sync_entries.size());
   EXPECT_TRUE(URLsEqual(entries[1], sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeHasSyncNoMerge) {
   history::VisitVector native_visits;
   history::VisitVector sync_visits;
   history::URLRow native_entry(MakeTypedUrlEntry("http://native.com", "entry",
                                                  2, 15, false, &native_visits));
   history::URLRow sync_entry(MakeTypedUrlEntry("http://sync.com", "entry", 3,
                                                16, false, &sync_visits));
 
   history::URLRows native_entries;
   native_entries.push_back(native_entry);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(native_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(native_visits), Return(true)));
   EXPECT_CALL((history_backend()), AddVisits(_, _, history::SOURCE_SYNCED))
       .WillRepeatedly(Return(true));
 
   history::URLRows sync_entries;
   sync_entries.push_back(sync_entry);
 
   EXPECT_CALL((history_backend()), UpdateURL(_, _))
       .WillRepeatedly(Return(true));
   StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
 
@@ skipping 37 matching lines @@
   merged_visits.push_back(
       history::VisitRow(sync_entry.id(), base::Time::FromInternalValue(15), 0,
                         ui::PageTransitionFromInt(0), 0));
 
   history::URLRow merged_entry(MakeTypedUrlEntry("http://native.com", "name", 2,
                                                  17, false, &merged_visits));
 
   history::URLRows native_entries;
   native_entries.push_back(native_entry);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(native_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(native_visits), Return(true)));
   EXPECT_CALL((history_backend()), AddVisits(_, _, history::SOURCE_SYNCED))
       .WillRepeatedly(Return(true));
 
   history::URLRows sync_entries;
   sync_entries.push_back(sync_entry);
 
   EXPECT_CALL((history_backend()), UpdateURL(_, _))
       .WillRepeatedly(Return(true));
   EXPECT_CALL((history_backend()), SetPageTitle(_, _)).WillRepeatedly(Return());
   StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(merged_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeWithErrorHasSyncMerge) {
   history::VisitVector native_visits;
   history::URLRow native_entry(MakeTypedUrlEntry("http://native.com", "native",
                                                  2, 15, false, &native_visits));
   history::VisitVector sync_visits;
   history::URLRow sync_entry(MakeTypedUrlEntry("http://native.com", "sync", 1,
                                                17, false, &sync_visits));
 
   history::URLRows native_entries;
   native_entries.push_back(native_entry);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true)));
   // Return an error getting the visits for the native URL.
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
       .WillRepeatedly(Return(false));
   EXPECT_CALL((history_backend()), GetURL(_, _))
-      .WillRepeatedly(DoAll(SetArgumentPointee<1>(native_entry), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<1>(native_entry), Return(true)));
   EXPECT_CALL((history_backend()), AddVisits(_, _, history::SOURCE_SYNCED))
       .WillRepeatedly(Return(true));
 
   history::URLRows sync_entries;
   sync_entries.push_back(sync_entry);
 
   EXPECT_CALL((history_backend()), UpdateURL(_, _))
       .WillRepeatedly(Return(true));
   EXPECT_CALL((history_backend()), SetPageTitle(_, _)).WillRepeatedly(Return());
   StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(sync_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAdd) {
   history::VisitVector added_visits;
   history::URLRow added_entry(MakeTypedUrlEntry("http://added.com", "entry", 2,
                                                 15, false, &added_visits));
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_)).WillOnce(Return(true));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(added_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(added_visits), Return(true)));
 
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::URLRows changed_urls;
   changed_urls.push_back(added_entry);
   SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(added_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAddWithBlank) {
   history::VisitVector added_visits;
   history::URLRow empty_entry(
       MakeTypedUrlEntry("", "entry", 2, 15, false, &added_visits));
   history::URLRow added_entry(MakeTypedUrlEntry("http://added.com", "entry", 2,
                                                 15, false, &added_visits));
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_)).WillOnce(Return(true));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(DoAll(SetArgumentPointee<2>(added_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(added_visits), Return(true)));
 
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::URLRows changed_urls;
   changed_urls.push_back(empty_entry);
   changed_urls.push_back(added_entry);
   SendNotificationURLsModified(changed_urls);
 
   std::vector<history::URLRow> new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(added_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdate) {
   history::VisitVector original_visits;
   history::URLRow original_entry(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits));
   history::URLRows original_entries;
   original_entries.push_back(original_entry);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(original_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(original_visits), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   history::URLRow updated_entry(MakeTypedUrlEntry("http://mine.com", "entry", 7,
                                                   17, false, &updated_visits));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(updated_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(updated_visits), Return(true)));
 
   history::URLRows changed_urls;
   changed_urls.push_back(updated_entry);
   SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(updated_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAddFromVisit) {
   history::VisitVector added_visits;
   history::URLRow added_entry(MakeTypedUrlEntry("http://added.com", "entry", 2,
                                                 15, false, &added_visits));
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_)).WillOnce(Return(true));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(added_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(added_visits), Return(true)));
 
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, added_entry);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(added_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdateFromVisit) {
   history::VisitVector original_visits;
   history::URLRow original_entry(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits));
   history::URLRows original_entries;
   original_entries.push_back(original_entry);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(original_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(original_visits), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   history::URLRow updated_entry(MakeTypedUrlEntry("http://mine.com", "entry", 7,
                                                   17, false, &updated_visits));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillOnce(DoAll(SetArgumentPointee<2>(updated_visits), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<2>(updated_visits), Return(true)));
 
   SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, updated_entry);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(updated_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
   history::VisitVector original_visits;
   history::URLRow original_entry(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits));
   history::URLRows original_entries;
   original_entries.push_back(original_entry);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(original_entry, new_sync_entries[0]));
 
   history::VisitVector updated_visits;
   history::URLRow updated_entry(MakeTypedUrlEntry("http://mine.com", "entry", 7,
                                                   15, false, &updated_visits));
@@ skipping 33 matching lines @@
   history::URLRow original_entry1(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits1));
   history::VisitVector original_visits2;
   history::URLRow original_entry2(MakeTypedUrlEntry(
       "http://mine2.com", "entry2", 3, 15, false, &original_visits2));
   history::URLRows original_entries;
   original_entries.push_back(original_entry1);
   original_entries.push_back(original_entry2);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits1), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits1), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::URLRows rows;
   rows.push_back(history::URLRow(GURL("http://mine.com")));
   SendNotificationURLsDeleted(false, false, rows, std::set<GURL>());
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(original_entry2, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemoveExpired) {
   history::VisitVector original_visits1;
   history::URLRow original_entry1(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits1));
   history::VisitVector original_visits2;
   history::URLRow original_entry2(MakeTypedUrlEntry(
       "http://mine2.com", "entry2", 3, 15, false, &original_visits2));
   history::URLRows original_entries;
   original_entries.push_back(original_entry1);
   original_entries.push_back(original_entry2);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits1), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits1), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   // Setting expired=true should cause the sync code to ignore this deletion.
   history::URLRows rows;
   rows.push_back(history::URLRow(GURL("http://mine.com")));
   SendNotificationURLsDeleted(false, true, rows, std::set<GURL>());
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   // Both URLs should still be there.
   ASSERT_EQ(2U, new_sync_entries.size());
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemoveAll) {
   history::VisitVector original_visits1;
   history::URLRow original_entry1(MakeTypedUrlEntry(
       "http://mine.com", "entry", 2, 15, false, &original_visits1));
   history::VisitVector original_visits2;
   history::URLRow original_entry2(MakeTypedUrlEntry(
       "http://mine2.com", "entry2", 3, 15, false, &original_visits2));
   history::URLRows original_entries;
   original_entries.push_back(original_entry1);
   original_entries.push_back(original_entry2);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits1), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits1), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(2U, new_sync_entries.size());
 
   SendNotificationURLsDeleted(true, false, history::URLRows(),
                               std::set<GURL>());
 
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(0U, new_sync_entries.size());
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, FailWriteToHistoryBackend) {
   history::VisitVector native_visits;
   history::VisitVector sync_visits;
   history::URLRow native_entry(MakeTypedUrlEntry("http://native.com", "entry",
                                                  2, 15, false, &native_visits));
   history::URLRow sync_entry(MakeTypedUrlEntry("http://sync.com", "entry", 3,
                                                16, false, &sync_visits));
 
   history::URLRows native_entries;
   native_entries.push_back(native_entry);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(true)));
+      .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetURL(_, _))
-      .WillOnce(DoAll(SetArgumentPointee<1>(native_entry), Return(false)));
+      .WillOnce(DoAll(SetArgPointee<1>(native_entry), Return(false)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(native_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(native_visits), Return(true)));
   EXPECT_CALL((history_backend()), AddVisits(_, _, history::SOURCE_SYNCED))
       .WillRepeatedly(Return(false));
 
   history::URLRows sync_entries;
   sync_entries.push_back(sync_entry);
 
   EXPECT_CALL((history_backend()), UpdateURL(_, _))
       .WillRepeatedly(Return(false));
   TypedUrlSyncableService* syncable_service =
       StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
@@ skipping 11 matching lines @@
   history::VisitVector native_visits;
   history::VisitVector sync_visits;
   history::URLRow native_entry(MakeTypedUrlEntry("http://native.com", "entry",
                                                  2, 15, false, &native_visits));
   history::URLRow sync_entry(MakeTypedUrlEntry("http://sync.com", "entry", 3,
                                                16, false, &sync_visits));
 
   history::URLRows native_entries;
   native_entries.push_back(native_entry);
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_entries), Return(false)));
+      .WillOnce(DoAll(SetArgPointee<0>(native_entries), Return(false)));
 
   history::URLRows sync_entries;
   sync_entries.push_back(sync_entry);
 
   StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
   // Errors getting typed URLs will cause an unrecoverable error (since we can
   // do *nothing* in that case).
   ASSERT_TRUE(sync_service()->data_type_status_table().GetFailedTypes().Has(
       syncer::TYPED_URLS));
   ASSERT_EQ(1u,
             sync_service()->data_type_status_table().GetFailedTypes().Size());
   // Can't check GetErrorPercentage(), because generating an unrecoverable
   // error will free the model associator.
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, IgnoreLocalFileURL) {
   history::VisitVector original_visits;
   // Create http and file url.
   history::URLRow url_entry(MakeTypedUrlEntry("http://yey.com", "yey", 12, 15,
                                               false, &original_visits));
   history::URLRow file_entry(MakeTypedUrlEntry(
       "file:///kitty.jpg", "kitteh", 12, 15, false, &original_visits));
 
   history::URLRows original_entries;
   original_entries.push_back(url_entry);
   original_entries.push_back(file_entry);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   // Create updates for the previous urls + a new file one.
   history::URLRow updated_url_entry(MakeTypedUrlEntry(
       "http://yey.com", "yey", 20, 15, false, &updated_visits));
   history::URLRow updated_file_entry(MakeTypedUrlEntry(
       "file:///cat.jpg", "cat", 20, 15, false, &updated_visits));
   history::URLRow new_file_entry(MakeTypedUrlEntry("file:///dog.jpg", "dog", 20,
@@ skipping 20 matching lines @@
   history::URLRow url_entry(MakeTypedUrlEntry("http://yey.com", "yey", 12, 15,
                                               false, &original_visits));
   history::URLRow localhost_entry(MakeTypedUrlEntry(
       "http://localhost", "localhost", 12, 15, false, &original_visits));
 
   history::URLRows original_entries;
   original_entries.push_back(url_entry);
   original_entries.push_back(localhost_entry);
 
   EXPECT_CALL((history_backend()), GetAllTypedURLs(_))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<0>(original_entries), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<0>(original_entries), Return(true)));
   EXPECT_CALL((history_backend()), GetMostRecentVisitsForURL(_, _, _))
-      .WillRepeatedly(
-          DoAll(SetArgumentPointee<2>(original_visits), Return(true)));
+      .WillRepeatedly(DoAll(SetArgPointee<2>(original_visits), Return(true)));
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   // Update the previous entries and add a new localhost.
   history::URLRow updated_url_entry(MakeTypedUrlEntry(
       "http://yey.com", "yey", 20, 15, false, &updated_visits));
   history::URLRow updated_localhost_entry(MakeTypedUrlEntry(
       "http://localhost:80", "localhost", 20, 15, false, &original_visits));
   history::URLRow localhost_ip_entry(MakeTypedUrlEntry(
@@ skipping 31 matching lines @@
   SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // The change should be ignored.
   ASSERT_EQ(0U, new_sync_entries.size());
 }
 
 }  // namespace browser_sync