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

chrome/browser/safe_browsing/download_protection_service.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/safe_browsing/download_protection_service.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/safe_browsing/binary_feature_extractor.h"
 #include "chrome/browser/safe_browsing/download_feedback_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 609 matching lines @@
     Profile* profile = Profile::FromBrowserContext(item_->GetBrowserContext());
     HistoryService* history =
         HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
     if (!history) {
       SendRequest();
       return;
     }
 
     history->QueryRedirectsTo(
         tab_url_,
-        &request_consumer_,
         base::Bind(&CheckClientDownloadRequest::OnGotTabRedirects,
-                   base::Unretained(this)));
+                   base::Unretained(this),
+                   tab_url_),
+        &request_tracker_);
   }
 
-  void OnGotTabRedirects(HistoryService::Handle handle,
-                         GURL url,
-                         bool success,
-                         history::RedirectList* redirect_list) {
+  void OnGotTabRedirects(const GURL& url,
+                         const history::RedirectList* redirect_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK_EQ(url, tab_url_);
 
-    if (success && redirect_list->size() > 0) {
-      for (history::RedirectList::reverse_iterator i = redirect_list->rbegin();
-           i != redirect_list->rend();
-           ++i) {
-        tab_redirects_.push_back(*i);
-      }
+    if (!redirect_list->empty()) {
+      tab_redirects_.insert(
+          tab_redirects_.end(), redirect_list->rbegin(), redirect_list->rend());
     }
 
     SendRequest();
   }
 
   void SendRequest() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     // This is our last chance to check whether the request has been canceled
     // before sending it.
@@ skipping 182 matching lines @@
   DownloadProtectionService* service_;
   scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor_;
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
   const bool pingback_enabled_;
   scoped_ptr<net::URLFetcher> fetcher_;
   scoped_refptr<SandboxedZipAnalyzer> analyzer_;
   base::TimeTicks zip_analysis_start_time_;
   bool finished_;
   ClientDownloadRequest::DownloadType type_;
   std::string client_download_request_data_;
-  CancelableRequestConsumer request_consumer_;  // For HistoryService lookup.
+  base::CancelableTaskTracker request_tracker_;  // For HistoryService lookup.
   base::WeakPtrFactory<CheckClientDownloadRequest> weakptr_factory_;
   base::TimeTicks start_time_;  // Used for stats.
   base::TimeTicks timeout_start_time_;
   base::TimeTicks request_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckClientDownloadRequest);
 };
 
 DownloadProtectionService::DownloadProtectionService(
     SafeBrowsingService* sb_service,
@@ skipping 184 matching lines @@
 GURL DownloadProtectionService::GetDownloadRequestUrl() {
   GURL url(kDownloadRequestUrl);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 
 }  // namespace safe_browsing