Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/history/history_backend.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.
 
 #include "chrome/browser/history/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 134 matching lines @@
   }
 
  private:
   friend class base::RefCounted<CommitLaterTask>;
 
   ~CommitLaterTask() {}
 
   scoped_refptr<HistoryBackend> history_backend_;
 };
 
+// HistoryBackend::QueryURLResult ----------------------------------------------
+
+HistoryBackend::QueryURLResult::QueryURLResult() : success(false) {
+}
+
+HistoryBackend::QueryURLResult::~QueryURLResult() {
+}
+
 // HistoryBackend --------------------------------------------------------------
 
 HistoryBackend::HistoryBackend(const base::FilePath& history_dir,
                                Delegate* delegate,
                                HistoryClient* history_client)
     : delegate_(delegate),
       history_dir_(history_dir),
       scheduled_kill_db_(false),
       expirer_(this, history_client),
       recent_redirects_(kMaxRedirectCount),
@@ skipping 818 matching lines @@
   db_->GetVisitsSource(visits, sources);
   return true;
 }
 
 bool HistoryBackend::GetURL(const GURL& url, history::URLRow* url_row) {
   if (db_)
     return db_->GetRowForURL(url, url_row) != 0;
   return false;
 }
 
-void HistoryBackend::QueryURL(scoped_refptr<QueryURLRequest> request,
-                              const GURL& url,
-                              bool want_visits) {
-  if (request->canceled())
-    return;
-
-  bool success = false;
-  URLRow* row = &request->value.a;
-  VisitVector* visits = &request->value.b;
-  if (db_) {
-    if (db_->GetRowForURL(url, row)) {
-      // Have a row.
-      success = true;
-
-      // Optionally query the visits.
-      if (want_visits)
-        db_->GetVisitsForURL(row->id(), visits);
-    }
+HistoryBackend::QueryURLResult HistoryBackend::QueryURL(const GURL& url,
+                                                        bool want_visits) {
+  QueryURLResult result;
+  result.success = db_ && db_->GetRowForURL(url, &result.row);
+  // Optionally query the visits.
+  if (result.success && want_visits) {
+    db_->GetVisitsForURL(result.row.id(), &result.visits);
   }
-  request->ForwardResult(request->handle(), success, row, visits);
+  return result;
 }
 
 TypedUrlSyncableService* HistoryBackend::GetTypedUrlSyncableService() const {
   return typed_url_syncable_service_.get();
 }
 
 // Segment usage ---------------------------------------------------------------
 
 void HistoryBackend::DeleteOldSegmentData() {
   if (db_)
@@ skipping 1825 matching lines @@
   int rank = kPageVisitStatsMaxTopSites;
   std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url);
   if (it != most_visited_urls_map_.end())
     rank = (*it).second;
   UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank",
                             rank, kPageVisitStatsMaxTopSites + 1);
 }
 #endif
 
 }  // namespace history