Port HistoryService::QueryRedirects{From,To} to CancelableTaskTracker

chrome/browser/safe_browsing/malware_details_history.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.
 //
 // Implementation of the MalwareDetailsRedirectsCollector class.
 
 #include "chrome/browser/safe_browsing/malware_details_history.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 79 matching lines @@
 
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
   if (!history) {
     AllDone();
     return;
   }
 
   history->QueryRedirectsTo(
       url,
-      &request_consumer_,
       base::Bind(&MalwareDetailsRedirectsCollector::OnGotQueryRedirectsTo,
-                 base::Unretained(this)));
+                 base::Unretained(this),
+                 url),
+      &request_tracker_);
 }
 
 void MalwareDetailsRedirectsCollector::OnGotQueryRedirectsTo(
-    HistoryService::Handle handle,
-    GURL url,
-    bool success,
-    history::RedirectList* redirect_list) {
-
-  if (success && redirect_list->size() > 0) {
+    const GURL& url,
+    const history::RedirectList* redirect_list) {
+  if (!redirect_list->empty()) {
     std::vector<GURL> urllist;
     urllist.push_back(url);
-    for (size_t i = 0; i < redirect_list->size(); i++) {
-      urllist.push_back(redirect_list->at(i));
-    }
+    urllist.insert(urllist.end(), redirect_list->begin(), redirect_list->end());
     redirects_urls_.push_back(urllist);
   }
 
   // Proceed to next url
   ++urls_it_;
 
   if (urls_it_ == urls_.end()) {
     AllDone();
     return;
   }
 
   GetRedirects(*urls_it_);
 }
 
 void MalwareDetailsRedirectsCollector::AllDone() {
   DVLOG(1) << "AllDone";
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
   callback_.Reset();
 }