Port History::QueryMostVisitedURLs to use CancelableTaskTracker

chrome/browser/history/top_sites_impl.cc

 // Copyright (c) 2013 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/top_sites_impl.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 438 matching lines @@
   if (!profile_)
     return 0;
 
   HistoryService* hs = HistoryServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
   // |hs| may be null during unit tests.
   if (hs) {
     return hs->QueryMostVisitedURLs(
         num_results_to_request_from_history(),
         kDaysOfHistory,
-        &history_consumer_,
         base::Bind(&TopSitesImpl::OnTopSitesAvailableFromHistory,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        &cancelable_task_tracker_);
   }
   return 0;
 }
 
 bool TopSitesImpl::IsKnownURL(const GURL& url) {
   return loaded_ && cache_->IsKnownURL(url);
 }
 
 const std::string& TopSitesImpl::GetCanonicalURLString(const GURL& url) const {
   return cache_->GetCanonicalURL(url).spec();
@@ skipping 451 matching lines @@
   ResetThreadSafeImageCache();
 
   MoveStateToLoaded();
 
   // Start a timer that refreshes top sites from history.
   RestartQueryForTopSitesTimer(
       base::TimeDelta::FromSeconds(kUpdateIntervalSecs));
 }
 
 void TopSitesImpl::OnTopSitesAvailableFromHistory(
-    CancelableRequestProvider::Handle handle,
-    MostVisitedURLList pages) {
-  SetTopSites(pages);
+    const MostVisitedURLList* pages) {
+  DCHECK(pages);
+  SetTopSites(*pages);
 }
 
 }  // namespace history