Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/sync/test/integration/typed_urls_helper.cc

Index: chrome/browser/sync/test/integration/typed_urls_helper.cc
diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc
index 54fea80cefbb662d2c5e33385c84e191e4316583..49db2d8911bf7081bb372e6c26d55af856bbbec2 100644
--- a/chrome/browser/sync/test/integration/typed_urls_helper.cc
+++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc
@@ -7,8 +7,8 @@
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
-#include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
@@ -141,12 +141,11 @@ class RemoveVisitsTask : public history::HistoryDBTask {
 // Waits for the history DB thread to finish executing its current set of
 // tasks.
 void WaitForHistoryDBThread(int index) {
-  CancelableRequestConsumer cancelable_consumer;
+  base::CancelableTaskTracker tracker;
   HistoryService* service = HistoryServiceFactory::GetForProfileWithoutCreating(
       test()->GetProfile(index));
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(new FlushHistoryDBQueueTask(&wait_event),
-                          &cancelable_consumer);
+  service->ScheduleDBTask(new FlushHistoryDBQueueTask(&wait_event), &tracker);
   wait_event.Wait();
 }
 
@@ -170,43 +169,41 @@ void AddToHistory(HistoryService* service,
 }
 
 history::URLRows GetTypedUrlsFromHistoryService(HistoryService* service) {
-  CancelableRequestConsumer cancelable_consumer;
+  base::CancelableTaskTracker tracker;
   history::URLRows rows;
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(new GetTypedUrlsTask(&rows, &wait_event),
-                          &cancelable_consumer);
+  service->ScheduleDBTask(new GetTypedUrlsTask(&rows, &wait_event), &tracker);
   wait_event.Wait();
   return rows;
 }
 
 bool GetUrlFromHistoryService(HistoryService* service,
                               const GURL& url, history::URLRow* row) {
-  CancelableRequestConsumer cancelable_consumer;
+  base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
   bool found;
   service->ScheduleDBTask(new GetUrlTask(url, row, &found, &wait_event),
-                          &cancelable_consumer);
+                          &tracker);
   wait_event.Wait();
   return found;
 }
 
 history::VisitVector GetVisitsFromHistoryService(HistoryService* service,
                                                  history::URLID id) {
-  CancelableRequestConsumer cancelable_consumer;
+  base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
   history::VisitVector visits;
   service->ScheduleDBTask(new GetVisitsTask(id, &visits, &wait_event),
-                          &cancelable_consumer);
+                          &tracker);
   wait_event.Wait();
   return visits;
 }
 
 void RemoveVisitsFromHistoryService(HistoryService* service,
                                     const history::VisitVector& visits) {
-  CancelableRequestConsumer cancelable_consumer;
+  base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(new RemoveVisitsTask(visits, &wait_event),
-                          &cancelable_consumer);
+  service->ScheduleDBTask(new RemoveVisitsTask(visits, &wait_event), &tracker);
   wait_event.Wait();
 }