Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/history/history_service.h

Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 6e6417675d281dff037b4cbd2dab8afcc0c44aba..c5fd133e82311492a5f94a5dfae7580e40e44046 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -233,20 +233,20 @@
   // empty.
   //
   // If success is false, neither the row nor the vector will be valid.
-  typedef base::Callback<
-      void(bool,  // Success flag, when false, nothing else is valid.
-           const history::URLRow&,
-           const history::VisitVector&)> QueryURLCallback;
+  typedef base::Callback<void(
+      Handle,
+      bool,  // Success flag, when false, nothing else is valid.
+      const history::URLRow*,
+      history::VisitVector*)> QueryURLCallback;
 
   // Queries the basic information about the URL in the history database. If
   // the caller is interested in the visits (each time the URL is visited),
   // set |want_visits| to true. If these are not needed, the function will be
   // faster by setting this to false.
-  base::CancelableTaskTracker::TaskId QueryURL(
-      const GURL& url,
-      bool want_visits,
-      const QueryURLCallback& callback,
-      base::CancelableTaskTracker* tracker);
+  Handle QueryURL(const GURL& url,
+                  bool want_visits,
+                  CancelableRequestConsumerBase* consumer,
+                  const QueryURLCallback& callback);
 
   // Provides the result of a query. See QueryResults in history_types.h.
   // The common use will be to use QueryResults.Swap to suck the contents of