Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index c3780e5ab4644421901481a3c46d903fe1c848c3..f49b30868356923706d77f2081808c22a715562b 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -113,8 +113,9 @@ class HistoryServiceMock : public HistoryService {
  public:
   explicit HistoryServiceMock(history::HistoryClient* client, Profile* profile)
       : HistoryService(client, profile) {}
-  MOCK_METHOD2(ScheduleDBTask, void(history::HistoryDBTask*,
-                                    CancelableRequestConsumerBase*));
+  MOCK_METHOD2(ScheduleDBTask,
+               void(scoped_refptr<history::HistoryDBTask>,
+                    base::CancelableTaskTracker*));
   MOCK_METHOD0(Shutdown, void());
 
   void ShutdownBaseService() {
@@ -151,17 +152,14 @@ class TestTypedUrlModelAssociator : public TypedUrlModelAssociator {
 };
 
 void RunOnDBThreadCallback(HistoryBackend* backend,
-                           history::HistoryDBTask* task) {
+                           scoped_refptr<history::HistoryDBTask> task) {
   task->RunOnDBThread(backend, NULL);
 }
 
 ACTION_P2(RunTaskOnDBThread, thread, backend) {
-  // ScheduleDBTask takes ownership of its task argument, so we
-  // should, too.
-  scoped_refptr<history::HistoryDBTask> task(arg0);
   thread->message_loop()->PostTask(
-      FROM_HERE, base::Bind(&RunOnDBThreadCallback, base::Unretained(backend),
-                            task));
+      FROM_HERE,
+      base::Bind(&RunOnDBThreadCallback, base::Unretained(backend), arg0));
 }
 
 ACTION_P2(ShutdownHistoryService, thread, service) {