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 0284f6e910708fd1e71a2f627c018681946b848a..8c0dec81d453b3bc720182ab97a8476e928ef691 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -88,6 +88,12 @@ void RunWithQueryURLResult(const HistoryService::QueryURLCallback& callback,
   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 {
@@ -806,13 +812,23 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryRedirectsTo(
                                    base::Bind(callback, base::Owned(result)));
 }
 
-HistoryService::Handle HistoryService::GetVisibleVisitCountToHost(
+base::CancelableTaskTracker::TaskId HistoryService::GetVisibleVisitCountToHost(
     const GURL& url,
-    CancelableRequestConsumerBase* consumer,
-    const GetVisibleVisitCountToHostCallback& callback) {
+    const GetVisibleVisitCountToHostCallback& callback,
+    base::CancelableTaskTracker* tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return Schedule(PRIORITY_UI, &HistoryBackend::GetVisibleVisitCountToHost,
-      consumer, new history::GetVisibleVisitCountToHostRequest(callback), url);
+  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)));
 }
 
 base::CancelableTaskTracker::TaskId HistoryService::QueryMostVisitedURLs(