Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/safe_browsing/browser_feature_extractor.h

 // Copyright (c) 2011 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.
 //
 // BrowserFeatureExtractor computes various browser features for client-side
 // phishing detection.  For now it does a bunch of lookups in the history
 // service to see whether a particular URL has been visited before by the
 // user.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 #define CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
+#include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "url/gurl.h"
 #include "webkit/common/resource_type.h"
 
 
 class HistoryService;
 
 namespace content {
@@ skipping 53 matching lines @@
 };
 
 // All methods of this class must be called on the UI thread (including
 // the constructor).
 class BrowserFeatureExtractor {
  public:
   // Called when feature extraction is done.  The first argument will be
   // true iff feature extraction succeeded.  The second argument is the
   // phishing request which was modified by the feature extractor.  The
   // DoneCallback takes ownership of the request object.
-  typedef base::Callback<void(bool, scoped_ptr<ClientPhishingRequest>)>
-      DoneCallback;
+  typedef base::Callback<void(bool, ClientPhishingRequest*)> DoneCallback;
   typedef base::Callback<void(bool, scoped_ptr<ClientMalwareRequest>)>
       MalwareDoneCallback;
 
   // The caller keeps ownership of the tab and host objects and is
   // responsible for ensuring that they stay valid for the entire
   // lifetime of this object.
   BrowserFeatureExtractor(content::WebContents* tab,
                           ClientSideDetectionHost* host);
 
   // The destructor will cancel any pending requests.
@@ skipping 12 matching lines @@
   // Begins extraction of the malware related features.  We take ownership
   // of the request object until |callback| is called.  Once feature extraction
   // is complete, |callback| will run on the UI thread.  |info| is not expected
   // to stay valid after ExtractMalwareFeatures returns.  All IPs stored in
   // |info| will be cleared by calling this function.
   virtual void ExtractMalwareFeatures(BrowseInfo* info,
                                       ClientMalwareRequest* request,
                                       const MalwareDoneCallback& callback);
 
  private:
+  friend class base::DeleteHelper<BrowserFeatureExtractor>;
+  typedef std::pair<ClientPhishingRequest*, DoneCallback> ExtractionData;
+  typedef std::map<CancelableRequestProvider::Handle,
+                   ExtractionData> PendingQueriesMap;
+
   // Synchronous browser feature extraction.
   void ExtractBrowseInfoFeatures(const BrowseInfo& info,
                                  ClientPhishingRequest* request);
 
   // Actually starts feature extraction (does the real work).
-  void StartExtractFeatures(scoped_ptr<ClientPhishingRequest> request,
+  void StartExtractFeatures(ClientPhishingRequest* request,
                             const DoneCallback& callback);
 
   // HistoryService callback which is called when we're done querying URL visits
   // in the history.
   void QueryUrlHistoryDone(scoped_ptr<ClientPhishingRequest> request,
                            const DoneCallback& callback,
                            bool success,
                            const history::URLRow& row,
                            const history::VisitVector& visits);
 
   // HistoryService callback which is called when we're done querying HTTP host
   // visits in the history.
-  void QueryHttpHostVisitsDone(scoped_ptr<ClientPhishingRequest> request,
-                               const DoneCallback& callback,
+  void QueryHttpHostVisitsDone(CancelableRequestProvider::Handle handle,
                                bool success,
                                int num_visits,
                                base::Time first_visit);
 
   // HistoryService callback which is called when we're done querying HTTPS host
   // visits in the history.
-  void QueryHttpsHostVisitsDone(scoped_ptr<ClientPhishingRequest> request,
-                                const DoneCallback& callback,
+  void QueryHttpsHostVisitsDone(CancelableRequestProvider::Handle handle,
                                 bool success,
                                 int num_visits,
                                 base::Time first_visit);
 
   // Helper function which sets the host history features given the
   // number of host visits and the time of the fist host visit.  Set
   // |is_http_query| to true if the URL scheme is HTTP and to false if
   // the scheme is HTTPS.
   void SetHostVisitsFeatures(int num_visits,
                              base::Time first_visit,
                              bool is_http_query,
                              ClientPhishingRequest* request);
 
+  // Helper function which stores the request and callback while the history
+  // query is being processed.
+  void StorePendingQuery(CancelableRequestProvider::Handle handle,
+                         ClientPhishingRequest* request,
+                         const DoneCallback& callback);
+
+  // Helper function which is the counterpart of StorePendingQuery.  If there
+  // is a pending query for the given handle it will return false and set both
+  // the request and cb pointers.  Otherwise, it will return false.
+  bool GetPendingQuery(CancelableRequestProvider::Handle handle,
+                       ClientPhishingRequest** request,
+                       DoneCallback* callback);
+
   // Helper function which gets the history server if possible.  If the pointer
   // is set it will return true and false otherwise.
   bool GetHistoryService(HistoryService** history);
 
   // Helper function which is called when we're done filtering out benign IPs
   // on the IO thread.  This function is called on the UI thread.
   void FinishExtractMalwareFeatures(scoped_ptr<IPUrlMap> bad_ips,
                                     MalwareDoneCallback callback,
                                     scoped_ptr<ClientMalwareRequest> request);
 
   content::WebContents* tab_;
   ClientSideDetectionHost* host_;
+  CancelableRequestConsumer request_consumer_;
   base::CancelableTaskTracker cancelable_task_tracker_;
   base::WeakPtrFactory<BrowserFeatureExtractor> weak_factory_;
 
+  // Set of pending extractions (i.e. extractions for which ExtractFeatures was
+  // called but not StartExtractFeatures).
+  std::map<ClientPhishingRequest*, DoneCallback> pending_extractions_;
+
+  // Set of pending queries (i.e., where history->Query...() was called but
+  // the history callback hasn't been invoked yet).
+  PendingQueriesMap pending_queries_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserFeatureExtractor);
 };
 
 }  // namespace safe_browsing
 #endif  // CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_