Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/safe_browsing/browser_feature_extractor.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/browser_feature_extractor.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 305 matching lines @@
     ClientPhishingRequest* request,
     const DoneCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   size_t removed = pending_extractions_.erase(request);
   DCHECK_EQ(1U, removed);
   HistoryService* history;
   if (!request || !request->IsInitialized() || !GetHistoryService(&history)) {
     callback.Run(false, request);
     return;
   }
-  // HistoryService::QueryURL migrated from CancelableRequestComsumer to
-  // CancelableRequestTracker and there is no Handle to associate to the
-  // request. Instead manage the request object lifetime by using a scoped_ptr
-  // and using base::Passed(). So if the asynchronous call is canceled, the
-  // request is deleted, otherwise the callback becomes the owner.
-  scoped_ptr<ClientPhishingRequest> owned_request(request);
-  history->QueryURL(GURL(request->url()),
-                    true /* wants_visits */,
-                    base::Bind(&BrowserFeatureExtractor::QueryUrlHistoryDone,
-                               base::Unretained(this),
-                               base::Passed(&owned_request),
-                               callback),
-                    &cancelable_task_tracker_);
+  CancelableRequestProvider::Handle handle = history->QueryURL(
+      GURL(request->url()),
+      true /* wants_visits */,
+      &request_consumer_,
+      base::Bind(&BrowserFeatureExtractor::QueryUrlHistoryDone,
+                 base::Unretained(this)));
+
+  StorePendingQuery(handle, request, callback);
 }
 
 void BrowserFeatureExtractor::QueryUrlHistoryDone(
-    scoped_ptr<ClientPhishingRequest> owned_request,
-    const DoneCallback& callback,
+    CancelableRequestProvider::Handle handle,
     bool success,
-    const history::URLRow& row,
-    const history::VisitVector& visits) {
+    const history::URLRow* row,
+    history::VisitVector* visits) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(owned_request);
+  ClientPhishingRequest* request;
+  DoneCallback callback;
+  if (!GetPendingQuery(handle, &request, &callback)) {
+    DLOG(FATAL) << "No pending history query found";
+    return;
+  }
+  DCHECK(request);
   DCHECK(!callback.is_null());
-  ClientPhishingRequest* request = owned_request.release();
   if (!success) {
     // URL is not found in the history.  In practice this should not
     // happen (unless there is a real error) because we just visited
     // that URL.
     callback.Run(false, request);
     return;
   }
   AddFeature(features::kUrlHistoryVisitCount,
-             static_cast<double>(row.visit_count()),
+             static_cast<double>(row->visit_count()),
              request);
 
   base::Time threshold = base::Time::Now() - base::TimeDelta::FromDays(1);
   int num_visits_24h_ago = 0;
   int num_visits_typed = 0;
   int num_visits_link = 0;
-  for (history::VisitVector::const_iterator it = visits.begin();
-       it != visits.end();
-       ++it) {
+  for (history::VisitVector::const_iterator it = visits->begin();
+       it != visits->end(); ++it) {
     if (!content::PageTransitionIsMainFrame(it->transition)) {
       continue;
     }
     if (it->visit_time < threshold) {
       ++num_visits_24h_ago;
     }
     content::PageTransition transition = content::PageTransitionStripQualifier(
         it->transition);
     if (transition == content::PAGE_TRANSITION_TYPED) {
       ++num_visits_typed;
@@ skipping 155 matching lines @@
     // Limit the number of matched bad IPs in one request to control
     // the request's size
     if (matched_bad_ips >= kMaxMalwareIPPerRequest) {
       break;
     }
   }
   callback.Run(true, request.Pass());
 }
 
 }  // namespace safe_browsing