Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/prerender/prerender_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/predictors/logged_in_predictor_table.h"
 #include "chrome/browser/prerender/prerender_config.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_events.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
@@ skipping 284 matching lines @@
 
   // Checks if the LoggedInPredictor shows that the user is likely logged on
   // to the site for the URL provided.
   void CheckIfLikelyLoggedInOnURL(const GURL& url,
                                   bool* lookup_result,
                                   bool* database_was_present,
                                   const base::Closure& result_cb);
 
   void 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* visits);
 
   Profile* profile() const { return profile_; }
 
   // Classes which will be tested in prerender unit browser tests should use
   // these methods to get times for comparison, so that the test framework can
   // mock advancing/retarding time.
   virtual base::Time GetCurrentTime() const;
   virtual base::TimeTicks GetCurrentTimeTicks() const;
 
   scoped_refptr<predictors::LoggedInPredictorTable>
@@ skipping 399 matching lines @@
   // Here, we keep the logged in predictor state, but potentially a superset
   // of its actual (database-backed) state, since we do not incorporate
   // browser data deletion. We do not use this for actual lookups, but only
   // to query cookie data for domains we know there was a login before.
   // This is required to avoid a large number of cookie lookups on bulk
   // deletion of cookies.
   scoped_ptr<LoggedInStateMap> logged_in_state_;
 
   content::NotificationRegistrar notification_registrar_;
 
-  base::CancelableTaskTracker query_url_tracker_;
+  CancelableRequestConsumer query_url_consumer_;
 
   // The number of bytes transferred over the network for the profile this
   // PrerenderManager is attached to.
   int64 profile_network_bytes_;
 
   // The value of profile_network_bytes_ that was last recorded.
   int64 last_recorded_profile_network_bytes_;
 
   // Set of process hosts being prerendered.
   typedef std::set<content::RenderProcessHost*> PrerenderProcessSet;
   PrerenderProcessSet prerender_process_hosts_;
 
   // Indicates whether the cookie store for this profile has fully loaded yet.
   bool cookie_store_loaded_;
 
   base::Closure on_cookie_store_loaded_cb_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_