Revert 203400 "Add a killswitch for CSD malware IP match and rep..."

trunk/src/chrome/browser/safe_browsing/safe_browsing_database.h

Index: trunk/src/chrome/browser/safe_browsing/safe_browsing_database.h
===================================================================
--- trunk/src/chrome/browser/safe_browsing/safe_browsing_database.h	(revision 204084)
+++ trunk/src/chrome/browser/safe_browsing/safe_browsing_database.h	(working copy)
@@ -171,8 +171,6 @@
       const std::vector<SBPrefix>& prefixes,
       const std::vector<SBFullHashResult>& full_hits) = 0;
 
-  virtual bool MalwareIPMatchKillSwitchOn() = 0;
-
   // The name of the bloom-filter file for the given database file.
   // NOTE(shess): OBSOLETE.  Present for deleting stale files.
   static base::FilePath BloomFilterForFilename(
@@ -299,9 +297,6 @@
       const std::vector<SBPrefix>& prefixes,
       const std::vector<SBFullHashResult>& full_hits) OVERRIDE;
 
-  // Returns the value of malware_kill_switch_;
-  virtual bool MalwareIPMatchKillSwitchOn() OVERRIDE;
-
  private:
   friend class SafeBrowsingDatabaseTest;
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseTest, HashCaching);
@@ -373,7 +368,8 @@
 
   // Lock for protecting access to variables that may be used on the
   // IO thread.  This includes |prefix_set_|, |full_browse_hashes_|,
-  // |pending_browse_hashes_|, |prefix_miss_cache_|, |csd_whitelist_|.
+  // |pending_browse_hashes_|, |prefix_miss_cache_|, |csd_whitelist_|,
+  // and |csd_whitelist_all_urls_|.
   base::Lock lookup_lock_;
 
   // Underlying persistent store for chunk data.