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

chrome/browser/safe_browsing/malware_details_history.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_SAFE_BROWSING_MALWARE_DETAILS_HISTORY_H_
 #define CHROME_BROWSER_SAFE_BROWSING_MALWARE_DETAILS_HISTORY_H_
 
 // This class gets redirect chain for urls from the history service.
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/history_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/base/completion_callback.h"
 
 namespace safe_browsing {
 typedef std::vector<GURL> RedirectChain;
 }
 
@@ skipping 24 matching lines @@
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<MalwareDetailsRedirectsCollector>;
 
   virtual ~MalwareDetailsRedirectsCollector();
 
   void StartGetRedirects(const std::vector<GURL>& urls);
   void GetRedirects(const GURL& url);
-  void OnGotQueryRedirectsTo(HistoryService::Handle handle,
-                             GURL url,
-                             bool success,
-                             history::RedirectList* redirect_list);
+  void OnGotQueryRedirectsTo(const GURL& url,
+                             const history::RedirectList* redirect_list);
 
   // Posts the callback method back to IO thread when redirects collecting
   // is all done.
   void AllDone();
 
   Profile* profile_;
-  CancelableRequestConsumer request_consumer_;
+  base::CancelableTaskTracker request_tracker_;
 
   // Method we call when we are done. The caller must be alive for the
   // whole time, we are modifying its state (see above).
   base::Closure callback_;
 
   // Sets to true once StartHistoryCollection is called
   bool has_started_;
 
   // The urls we need to get redirects for
   std::vector<GURL> urls_;
   // The iterator goes over urls_
   std::vector<GURL>::iterator urls_it_;
   // The collected directs from history service
   std::vector<safe_browsing::RedirectChain> redirects_urls_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(MalwareDetailsRedirectsCollector);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_MALWARE_DETAILS_HISTORY_H_