Separate pre-classification checks for client-side malware and phishing

chrome/browser/safe_browsing/browser_feature_extractor.h

Index: chrome/browser/safe_browsing/browser_feature_extractor.h
diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h
index 82a4e0d38b340e54d83961c4c683aa1b712127e2..bdad2067023fb0cad43c9c7869743bf708bac407 100644
--- a/chrome/browser/safe_browsing/browser_feature_extractor.h
+++ b/chrome/browser/safe_browsing/browser_feature_extractor.h
@@ -58,6 +58,9 @@ struct IPUrlInfo {
 typedef std::map<std::string, std::vector<IPUrlInfo> > IPUrlMap;
 
 struct BrowseInfo {
+  // The URL we're currently browsing.
+  GURL url;
+
   // List of IPv4 and IPv6 addresses from which content was requested
   // together with the hosts on it, while browsing to the |url|.
   IPUrlMap ips;
@@ -78,6 +81,9 @@ struct BrowseInfo {
   // The HTTP status code from this navigation.
   int http_status_code;
 
+  // The page ID of the navigation.  This comes from FrameNavigateParams.
+  int32 page_id;
+
   BrowseInfo();
   ~BrowseInfo();
 };