Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

Callback no longer receive a HistoryService::Handle, but instead client
code should use the returned base::CancelableTaskTracker::TaskId to
cancel an individual task.

Simplify implementation of BrowserFeatureExtractor as all the methods
from HistoryService that are called uses base::CancelableTaskTracker by
removing the mapping from HistoryService::Handle to request and using a
scoped_ptr to deal with the lifetime of the ClientPhishingRequest object.

BUG=371818
TBR=jochen

Review URL: https://codereview.chromium.org/351553004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280110 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index e7bb16d..f07def3 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -47,7 +47,6 @@ const base::FilePath::CharType kCrdownloadSuffix[] =
 // midnight.
 void VisitCountsToVisitedBefore(
     const base::Callback<void(bool)>& callback,
-    HistoryService::Handle unused_handle,
     bool found_visits,
     int count,
     base::Time first_visit) {
@@ -543,10 +542,13 @@ DownloadTargetDeterminer::Result
 
       if (history_service && download_->GetReferrerUrl().is_valid()) {
         history_service->GetVisibleVisitCountToHost(
-            download_->GetReferrerUrl(), &history_consumer_,
-            base::Bind(&VisitCountsToVisitedBefore, base::Bind(
-                &DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone,
-                weak_ptr_factory_.GetWeakPtr())));
+            download_->GetReferrerUrl(),
+            base::Bind(
+                &VisitCountsToVisitedBefore,
+                base::Bind(
+                    &DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone,
+                    weak_ptr_factory_.GetWeakPtr())),
+            &history_tracker_);
         return QUIT_DOLOOP;
       }
     }
diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
index a244331..f57341d 100644
--- a/chrome/browser/download/download_target_determiner.h
+++ b/chrome/browser/download/download_target_determiner.h
@@ -9,6 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/download/download_target_determiner_delegate.h"
@@ -293,7 +294,7 @@ class DownloadTargetDeterminer
   DownloadPrefs* download_prefs_;
   DownloadTargetDeterminerDelegate* delegate_;
   CompletionCallback completion_callback_;
-  CancelableRequestConsumer history_consumer_;
+  base::CancelableTaskTracker history_tracker_;
 
   base::WeakPtrFactory<DownloadTargetDeterminer> weak_ptr_factory_;