Revert 98168, it caused compile errors on mac:

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 <string>
 #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"
@@ skipping 11 matching lines @@
   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.
+////////////////////////////////////////////////////
+
+// 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 {
  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 and service objects and is
   // responsible for ensuring that they stay valid for the entire
   // lifetime of this object.
   BrowserFeatureExtractor(TabContents* tab,
                           ClientSideDetectionService* service);
 
   // 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.  |info| may not be valid after
   // ExtractFeatures returns.  This method must run on the UI thread.
   virtual void ExtractFeatures(const BrowseInfo* info,
                                ClientPhishingRequest* request,
                                DoneCallback* callback);
 
-  // The size of hash prefix to use for
-  // ClientPhishingRequest.suffix_prefix_hash.  Public for testing.
-  static const int kSuffixPrefixHashLength;
-
  private:
   friend class DeleteTask<BrowserFeatureExtractor>;
   typedef std::pair<ClientPhishingRequest*, DoneCallback*> ExtractionData;
   typedef std::map<CancelableRequestProvider::Handle,
                    ExtractionData> PendingQueriesMap;
 
   // Synchronous browser feature extraction.
   void ExtractBrowseInfoFeatures(const BrowseInfo& info,
                                  ClientPhishingRequest* request);
 
@@ skipping 41 matching lines @@
   // is a pending query for the given handle it will return false and set both
   // the request and cb pointers.  Otherwise, it will return false.
   bool GetPendingQuery(CancelableRequestProvider::Handle handle,
                        ClientPhishingRequest** request,
                        DoneCallback** callback);
 
   // Helper function which gets the history server if possible.  If the pointer
   // is set it will return true and false otherwise.
   bool GetHistoryService(HistoryService** history);
 
-  // Computes the SHA-256 hash prefix for the URL and adds it to the
-  // ClientPhishingRequest.
-  void ComputeURLHash(ClientPhishingRequest* request);
-
   TabContents* tab_;
   ClientSideDetectionService* service_;
   CancelableRequestConsumer request_consumer_;
   ScopedRunnableMethodFactory<BrowserFeatureExtractor> method_factory_;
 
   // Set of pending extractions (i.e. extractions for which ExtractFeatures was
   // called but not StartExtractFeatures).
   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_