Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/history/history_service.cc

Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 7e52b66f234471158e16171d46133a3c12e681b1..294bc75be92fb34800b25b9dadb205b94c6c6d7d 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -88,12 +88,6 @@
   callback.Run(result->success, result->row, result->visits);
 }
 
-void RunWithVisibleVisitCountToHostResult(
-    const HistoryService::GetVisibleVisitCountToHostCallback& callback,
-    const history::VisibleVisitCountToHostResult* result) {
-  callback.Run(result->success, result->count, result->first_visit);
-}
-
 // Extract history::URLRows into GURLs for VisitedLinkMaster.
 class URLIteratorFromURLRows
     : public visitedlink::VisitedLinkMaster::URLIterator {
@@ -835,23 +829,13 @@
                                    base::Bind(callback, base::Owned(result)));
 }
 
-base::CancelableTaskTracker::TaskId HistoryService::GetVisibleVisitCountToHost(
+HistoryService::Handle HistoryService::GetVisibleVisitCountToHost(
     const GURL& url,
-    const GetVisibleVisitCountToHostCallback& callback,
-    base::CancelableTaskTracker* tracker) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  history::VisibleVisitCountToHostResult* result =
-      new history::VisibleVisitCountToHostResult();
-  return tracker->PostTaskAndReply(
-      thread_->message_loop_proxy().get(),
-      FROM_HERE,
-      base::Bind(&HistoryBackend::GetVisibleVisitCountToHost,
-                 history_backend_.get(),
-                 url,
-                 base::Unretained(result)),
-      base::Bind(&RunWithVisibleVisitCountToHostResult,
-                 callback,
-                 base::Owned(result)));
+    CancelableRequestConsumerBase* consumer,
+    const GetVisibleVisitCountToHostCallback& callback) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return Schedule(PRIORITY_UI, &HistoryBackend::GetVisibleVisitCountToHost,
+      consumer, new history::GetVisibleVisitCountToHostRequest(callback), url);
 }
 
 HistoryService::Handle HistoryService::QueryTopURLsAndRedirects(