Send back the URL that matched the SafeBrowsing list with the CSD ping.

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/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/browser/cancelable_request.h"
 
 class HistoryService;
 class TabContents;
 
 namespace safe_browsing {
 class ClientPhishingRequest;
 class ClientSideDetectionService;
 
 struct BrowseInfo {
   // List of IPv4 and IPv6 addresses from which content was requested
   // while browsing to the |url|.
   std::set<std::string> ips;
 
+  // If a SafeBrowsing interstitial was shown for the current URL
+  // this will contain the UnsafeResource struct for that URL.
+  scoped_ptr<SafeBrowsingService::UnsafeResource> unsafe_resource;
+
   BrowseInfo();
   ~BrowseInfo();
 };
 
 namespace features {
 
 // TODO(noelutz): move renderer/safe_browsing/features.h to common.
 ////////////////////////////////////////////////////
 // History features.
 ////////////////////////////////////////////////////
@@ skipping 34 matching lines @@
 extern const char kReferrer[];
 // 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[];
 // True if this navigation is the first for this tab.
 extern const char kIsFirstNavigation[];
 
 // Resource was fetched from a known bad IP address.
 extern const char kBadIpFetch[];
+
+// SafeBrowsing related featues.  Fields from the UnsafeResource if there is
+// any.
+extern const char kSafeBrowsingMaliciousUrl[];
+extern const char kSafeBrowsingOriginalUrl[];
+extern const char kSafeBrowsingIsSubresource[];
+extern const char kSafeBrowsingThreatType[];
 }  // 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.
@@ skipping 89 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_