Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/sync/glue/history_model_worker.cc

Index: chrome/browser/sync/glue/history_model_worker.cc
diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc
index dc63d5e1f4e2315dd3ac4dd7c8ebcd8b4bd8547e..ef8dc0b335af96e5b80d08592ca7b018f694e982 100644
--- a/chrome/browser/sync/glue/history_model_worker.cc
+++ b/chrome/browser/sync/glue/history_model_worker.cc
@@ -66,13 +66,13 @@ namespace {
 // thread.
 void PostWorkerTask(const base::WeakPtr<HistoryService>& history_service,
                     const syncer::WorkCallback& work,
-                    CancelableRequestConsumerT<int, 0>* cancelable_consumer,
+                    base::CancelableTaskTracker* cancelable_tracker,
                     WaitableEvent* done,
                     syncer::SyncerError* error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (history_service.get()) {
     scoped_refptr<WorkerTask> task(new WorkerTask(work, done, error));
-    history_service->ScheduleDBTask(task.get(), cancelable_consumer);
+    history_service->ScheduleDBTask(task.get(), cancelable_tracker);
   } else {
     *error = syncer::CANNOT_DO_WORK;
     done->Signal();
@@ -94,7 +94,7 @@ void HistoryModelWorker::RegisterForLoopDestruction() {
   history_service_->ScheduleDBTask(
       new AddDBThreadObserverTask(
           base::Bind(&HistoryModelWorker::RegisterOnDBThread, this)),
-      &cancelable_consumer_);
+      &cancelable_tracker_);
 }
 
 void HistoryModelWorker::RegisterOnDBThread() {
@@ -107,7 +107,7 @@ syncer::SyncerError HistoryModelWorker::DoWorkAndWaitUntilDoneImpl(
   syncer::SyncerError error = syncer::UNSET;
   if (BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               base::Bind(&PostWorkerTask, history_service_,
-                                         work, &cancelable_consumer_,
+                                         work, &cancelable_tracker_,
                                          work_done_or_stopped(),
                                          &error))) {
     work_done_or_stopped()->Wait();