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

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_
@@ skipping 40 matching lines @@
   IPUrlInfo(const std::string& url,
             const std::string& method,
             const std::string& referrer,
             const ResourceType::Type& resource_type);
   ~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;
 
   // If a SafeBrowsing interstitial was shown for the current URL
   // this will contain the UnsafeResource struct for that URL.
   scoped_ptr<SafeBrowsingUIManager::UnsafeResource> unsafe_resource;
 
   // List of redirects that lead to the first page on the current host and
   // the current url respectively. These may be the same if the current url
   // is the first page on its host.
   std::vector<GURL> host_redirects;
   std::vector<GURL> url_redirects;
 
   // URL of the referrer of this URL load.
   GURL referrer;
 
   // 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();
 };
 
 // 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
@@ skipping 109 matching lines @@
 
   // 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_