Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/history/history_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 70 matching lines @@
     const favicon_base::FaviconRawBitmapCallback& callback,
     favicon_base::FaviconRawBitmapResult* bitmap_result) {
   callback.Run(*bitmap_result);
 }
 
 void RunWithQueryURLResult(const HistoryService::QueryURLCallback& callback,
                            const history::QueryURLResult* result) {
   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 {
  public:
   explicit URLIteratorFromURLRows(const history::URLRows& url_rows)
       : itr_(url_rows.begin()),
         end_(url_rows.end()) {
   }
 
   virtual const GURL& NextURL() OVERRIDE {
@@ skipping 721 matching lines @@
   history::RedirectList* result = new history::RedirectList();
   return tracker->PostTaskAndReply(thread_->message_loop_proxy().get(),
                                    FROM_HERE,
                                    base::Bind(&HistoryBackend::QueryRedirectsTo,
                                               history_backend_.get(),
                                               to_url,
                                               base::Unretained(result)),
                                    base::Bind(callback, base::Owned(result)));
 }
 
-base::CancelableTaskTracker::TaskId HistoryService::GetVisibleVisitCountToHost(
+HistoryService::Handle HistoryService::GetVisibleVisitCountToHost(
     const GURL& url,
-    const GetVisibleVisitCountToHostCallback& callback,
-    base::CancelableTaskTracker* tracker) {
+    CancelableRequestConsumerBase* consumer,
+    const GetVisibleVisitCountToHostCallback& callback) {
   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)));
+  return Schedule(PRIORITY_UI, &HistoryBackend::GetVisibleVisitCountToHost,
+      consumer, new history::GetVisibleVisitCountToHostRequest(callback), url);
 }
 
 HistoryService::Handle HistoryService::QueryTopURLsAndRedirects(
     int result_count,
     CancelableRequestConsumerBase* consumer,
     const QueryTopURLsAndRedirectsCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return Schedule(PRIORITY_NORMAL, &HistoryBackend::QueryTopURLsAndRedirects,
       consumer, new history::QueryTopURLsAndRedirectsRequest(callback),
       result_count);
@@ skipping 345 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   visit_database_observers_.RemoveObserver(observer);
 }
 
 void HistoryService::NotifyVisitDBObserversOnAddVisit(
     const history::BriefVisitInfo& info) {
   DCHECK(thread_checker_.CalledOnValidThread());
   FOR_EACH_OBSERVER(history::VisitDatabaseObserver, visit_database_observers_,
                     OnAddVisit(info));
 }