Send the referral URL with the client-side phishing detection request.

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_
 #pragma once
 
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/callback_old.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/history/history_types.h"
 #include "content/browser/cancelable_request.h"
+#include "content/common/page_transition_types.h"
+#include "googleurl/src/gurl.h"
 
 class HistoryService;
 class TabContents;
 
 namespace safe_browsing {
 class ClientPhishingRequest;
 
+struct BrowseInfo {
+  // The URL that is being classified.  This is redundant information but
+  // we keep it around to verify that the URL that comes back from the
+  // renderer is unchanged.
+  GURL url;
+
+  // The referrer URL.
+  GURL referrer;
+
+  // How did we get to the URL?
+  PageTransition::Type transition;
+};
+
 namespace features {
 
 // TODO(noelutz): move renderer/safe_browsing/features.h to common.
 ////////////////////////////////////////////////////
 // History features.
 ////////////////////////////////////////////////////
 
 // Number of visits to that URL stored in the browser history.
 // Should always be an integer larger than 1 because by the time
 // we lookup the history the current URL should already be stored there.
@@ skipping 10 matching lines @@
 
 // Number of user-visible visits to all URLs on the same host/port as
 // the URL for HTTP and HTTPs.
 extern const char kHttpHostVisitCount[];
 extern const char kHttpsHostVisitCount[];
 
 // Boolean feature which is true if the host was visited for the first
 // time more than 24h ago (only considers user-visible visits like above).
 extern const char kFirstHttpHostVisitMoreThan24hAgo[];
 extern const char kFirstHttpsHostVisitMoreThan24hAgo[];
+
+////////////////////////////////////////////////////
+// Browse features.
+////////////////////////////////////////////////////
+// True if the referrer was stripped because it is an SSL referrer.
+extern const char kHasSSLReferrer[];
+// Stores the page transition.  See: PageTransition.  We strip the qualifier.
+extern const char kPageTransitionType[];
 }  // namespace features
 
 // 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 Callback2<bool, ClientPhishingRequest*>::Type DoneCallback;
 
   // The caller keeps ownership of the tab object and is responsible for
   // ensuring that it stays valid for the entire lifetime of this object.
   explicit BrowserFeatureExtractor(TabContents* tab);
 
   // The destructor will cancel any pending requests.
   virtual ~BrowserFeatureExtractor();
 
   // Begins extraction of the browser features.  We take ownership
   // of the request object until |callback| is called (see DoneCallback above)
   // and will write the extracted features to the feature map.  Once the
   // feature extraction is complete, |callback| is run on the UI thread.  We
   // take ownership of the |callback| object.  This method must run on the UI
   // thread.
-  virtual void ExtractFeatures(ClientPhishingRequest* request,
+  virtual void ExtractFeatures(const BrowseInfo& info,
+                               ClientPhishingRequest* request,
                                DoneCallback* callback);
 
  private:
   friend class DeleteTask<BrowserFeatureExtractor>;
   typedef std::pair<ClientPhishingRequest*, DoneCallback*> ExtractionData;
   typedef std::map<CancelableRequestProvider::Handle,
                    ExtractionData> PendingQueriesMap;
 
   // Actually starts feature extraction (does the real work).
   void StartExtractFeatures(ClientPhishingRequest* request,
@@ skipping 55 matching lines @@
   std::set<ExtractionData> 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_