Port HistoryService::QueryFilteredURLs to CancelableRequestTracker

chrome/browser/ui/webui/ntp/suggestions_source_top_sites.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/ui/webui/ntp/suggestions_source_top_sites.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 43 matching lines @@
 
   base::DictionaryValue* item = items_.front();
   items_.pop_front();
   return item;
 }
 
 void SuggestionsSourceTopSites::FetchItems(Profile* profile) {
   DCHECK(combiner_);
   STLDeleteElements(&items_);
 
-  history_consumer_.CancelAllRequests();
+  history_tracker_.TryCancelAll();
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   // |history| may be null during unit tests.
   if (history) {
     history::VisitFilter time_filter;
     time_filter.SetFilterTime(base::Time::Now());
     time_filter.SetFilterWidth(GetFilterWidth());
     time_filter.set_sorting_order(GetSortingOrder());
 
-    history->QueryFilteredURLs(0, time_filter, debug_, &history_consumer_,
+    history->QueryFilteredURLs(
+        0,
+        time_filter,
+        debug_,
         base::Bind(&SuggestionsSourceTopSites::OnSuggestionsUrlsAvailable,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        &history_tracker_);
   }
 }
 
 void SuggestionsSourceTopSites::SetCombiner(SuggestionsCombiner* combiner) {
   DCHECK(!combiner_);
   combiner_ = combiner;
 }
 
 void SuggestionsSourceTopSites::OnSuggestionsUrlsAvailable(
-    CancelableRequestProvider::Handle handle,
-    const history::FilteredURLList& data) {
+    const history::FilteredURLList* data) {
+  DCHECK(data);
   DCHECK(combiner_);
-  for (size_t i = 0; i < data.size(); i++) {
-    const history::FilteredURL& suggested_url = data[i];
+  for (history::FilteredURLList::const_iterator iter = data->begin();
+       iter != data->end();
+       ++iter) {
+    const history::FilteredURL& suggested_url = *iter;

[Dan Beam, 2014/06/26 03:47:33]

nit: revert this hunk, data[i] -> (*data)[i]

[sdefresne, 2014/06/28 07:59:47]

Done.

     if (suggested_url.url.is_empty())
       continue;
 
     base::DictionaryValue* page_value = new base::DictionaryValue();
     NewTabUI::SetUrlTitleAndDirection(page_value,
                                       suggested_url.title,
                                       suggested_url.url);
     page_value->SetDouble("score", suggested_url.score);
     if (debug_) {
       if (suggested_url.extended_info.total_visits) {
@@ skipping 35 matching lines @@
 // static
 history::VisitFilter::SortingOrder
 SuggestionsSourceTopSites::GetSortingOrder() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
   if (cli->HasSwitch(switches::kSuggestionNtpGaussianFilter))
     return history::VisitFilter::ORDER_BY_TIME_GAUSSIAN;
   if (cli->HasSwitch(switches::kSuggestionNtpLinearFilter))
     return history::VisitFilter::ORDER_BY_TIME_LINEAR;
   return history::VisitFilter::ORDER_BY_RECENCY;
 }