Revert 98168, it caused compile errors on mac:

chrome/renderer/safe_browsing/features.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 //
 // Common types and constants for extracting and evaluating features in the
 // client-side phishing detection model.  A feature is simply a string and an
 // associated floating-point value between 0 and 1.  The phishing
 // classification model contains rules which give an appropriate weight to each
 // feature or combination of features.  These values can then be summed to
 // compute a final phishiness score.
 //
@@ skipping 52 matching lines @@
   static const size_t kMaxFeatureMapSize;
 
  private:
   base::hash_map<std::string, double> features_;
 
   DISALLOW_COPY_AND_ASSIGN(FeatureMap);
 };
 
 namespace features {
 // Constants for the various feature names that we use.
-//
-// IMPORTANT: when adding new features, you must update kAllowedFeatures in
-// chrome/browser/safe_browsing/client_side_detection_service.cc if the feature
-// should be sent in sanitized pingbacks.
 
 ////////////////////////////////////////////////////
 // URL host features
 ////////////////////////////////////////////////////
 
 // Set if the URL's hostname is an IP address.
 extern const char kUrlHostIsIpAddress[];
 // Token feature containing the portion of the hostname controlled by a
 // registrar, for example "com" or "co.uk".
 extern const char kUrlTldToken[];
@@ skipping 81 matching lines @@
 // Token feature for a term (whitespace-delimited) on a page.  Terms can be
 // single words or multi-word n-grams.  Rather than adding this feature for
 // every possible token on a page, only the terms that are mentioned in the
 // classification model are added.
 extern const char kPageTerm[];
 
 }  // namespace features
 }  // namepsace safe_browsing
 
 #endif  // CHROME_RENDERER_SAFE_BROWSING_FEATURES_H_