Add support for client-side phishing detection for non-UMA users.

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 13172418a80943b364a1c982ce0342292cba136a..126835955e51dccbcd9d1624c2c976a28ed151c9 100644
--- a/chrome/browser/safe_browsing/browser_feature_extractor.h
+++ b/chrome/browser/safe_browsing/browser_feature_extractor.h
@@ -13,6 +13,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <utility>
 
 #include "base/basictypes.h"
@@ -44,65 +45,6 @@ struct BrowseInfo {
   ~BrowseInfo();
 };
 
-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.
-extern const char kUrlHistoryVisitCount[];
-
-// Number of times the URL was typed in the Omnibox.
-extern const char kUrlHistoryTypedCount[];
-
-// Number of times the URL was reached by clicking a link.
-extern const char kUrlHistoryLinkCount[];
-
-// Number of times URL was visited more than 24h ago.
-extern const char kUrlHistoryVisitCountMoreThan24hAgo[];
-
-// 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.
-////////////////////////////////////////////////////
-// Note that these features may have the following prefixes appended to them
-// that tell for which page type the feature pertains.
-extern const char kHostPrefix[];
-extern const char kRedirectPrefix[];
-
-// Referrer
-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 {
@@ -132,6 +74,10 @@ class BrowserFeatureExtractor {
                                ClientPhishingRequest* request,
                                DoneCallback* callback);
 
+  // The size of hash prefix to use for
+  // ClientPhishingRequest.suvfix_prefix_hash.  Public for testing.

[mattm, 2011/08/12 03:00:28]

suvfix

[Brian Ryner, 2011/08/12 04:52:24]

Done.

+  static const int kSuffixPrefixHashLength;
+
  private:
   friend class DeleteTask<BrowserFeatureExtractor>;
   typedef std::pair<ClientPhishingRequest*, DoneCallback*> ExtractionData;
@@ -193,6 +139,10 @@ class BrowserFeatureExtractor {
   // is set it will return true and false otherwise.
   bool GetHistoryService(HistoryService** history);
 
+  // Computes the SHA-256 hash prefixes for the URL and adds them to the
+  // ClientPhishingRequest.
+  void ComputeURLHashes(ClientPhishingRequest* request);
+
   TabContents* tab_;
   ClientSideDetectionService* service_;
   CancelableRequestConsumer request_consumer_;