Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/prerender/prerender_manager.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/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 1355 matching lines @@
     histograms_->RecordConcurrency(active_prerenders_.size());
 
   // Query the history to see if the URL being prerendered has ever been
   // visited before.
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->QueryURL(
         url,
         false,
+        &query_url_consumer_,
         base::Bind(&PrerenderManager::OnHistoryServiceDidQueryURL,
                    base::Unretained(this),
                    origin,
-                   experiment),
-        &query_url_tracker_);
+                   experiment));
   }
 
   StartSchedulingPeriodicCleanups();
   return prerender_handle;
 }
 
 void PrerenderManager::StartSchedulingPeriodicCleanups() {
   DCHECK(CalledOnValidThread());
   if (repeating_timer_.IsRunning())
     return;
@@ skipping 454 matching lines @@
 
 void PrerenderManager::RecordCookieSendType(Origin origin,
                                             uint8 experiment_id,
                                             int cookie_send_type) const {
   histograms_->RecordCookieSendType(origin, experiment_id, cookie_send_type);
 }
 
 void PrerenderManager::OnHistoryServiceDidQueryURL(
     Origin origin,
     uint8 experiment_id,
+    CancelableRequestProvider::Handle handle,
     bool success,
-    const history::URLRow& url_row,
-    const history::VisitVector& /*visits*/) {
+    const history::URLRow* url_row,
+    history::VisitVector* visists) {
   histograms_->RecordPrerenderPageVisitedStatus(origin, experiment_id, success);
 }
 
 // static
 void PrerenderManager::HangSessionStorageMergesForTesting() {
   g_hang_session_storage_merges_for_testing = true;
 }
 
 void PrerenderManager::RecordNetworkBytes(Origin origin,
                                           bool used,
@@ skipping 44 matching lines @@
     content::RenderProcessHost* host) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prerender_process_hosts_.erase(host);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrerenderTracker::RemovePrerenderCookieStoreOnIOThread,
                  base::Unretained(prerender_tracker()), host->GetID(), false));
 }
 
 }  // namespace prerender