Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 29c3595f51a593a617ea1b6e87af0a29809eed9c..349ae04b1bda62422d0a3c60c66d8ee5394520a7 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
@@ -385,9 +384,9 @@
     history_service_->QueryURL(
         url,
         true,
+        &consumer_,
         base::Bind(&RemoveHistoryTester::SaveResultAndQuit,
-                   base::Unretained(this)),
-        &tracker_);
+                   base::Unretained(this)));
     message_loop_runner->Run();
     return query_url_success_;
   }
@@ -400,15 +399,16 @@
 
  private:
   // Callback for HistoryService::QueryURL.
-  void SaveResultAndQuit(bool success,
-                         const history::URLRow&,
-                         const history::VisitVector&) {
+  void SaveResultAndQuit(HistoryService::Handle,
+                         bool success,
+                         const history::URLRow*,
+                         history::VisitVector*) {
     query_url_success_ = success;
     quit_closure_.Run();
   }
 
   // For History requests.
-  base::CancelableTaskTracker tracker_;
+  CancelableRequestConsumer consumer_;
   bool query_url_success_;
   base::Closure quit_closure_;