Add a killswitch for CSD malware IP match and report feature. Use a new killswitch whitelist URL wh…

chrome/browser/safe_browsing/safe_browsing_database.h

Index: chrome/browser/safe_browsing/safe_browsing_database.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
index 856226b25b423eb504d49f68cbc37a760bfd9b03..4fb37d1842c2daa06e3f5b892c8dda67e8374b87 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.h
+++ b/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -164,6 +164,8 @@ class SafeBrowsingDatabase {
       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(
@@ -278,6 +280,9 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
       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);
@@ -309,7 +314,8 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   // of hashes is too large or if the kill switch URL is on the whitelist
   // we will whitelist everything.
   void LoadWhitelist(const std::vector<SBAddFullHash>& full_hashes,
-                     SBWhitelist* whitelist);
+                     SBWhitelist* whitelist,
+                     bool check_malware_killswitch);
 
   // Call this method if an error occured with the given whitelist.  This will
   // result in all lookups to the whitelist to return true.
@@ -340,7 +346,8 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   void UpdateBrowseStore();
   void UpdateWhitelistStore(const base::FilePath& store_filename,
                             SafeBrowsingStore* store,
-                            SBWhitelist* whitelist);
+                            SBWhitelist* whitelist,
+                            bool check_malware_killswitch);
 
   // Used to verify that various calls are made from the thread the
   // object was created on.
@@ -349,7 +356,7 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   // 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_|,
-  // and |csd_whitelist_all_urls_|.
+  // and |malware_kill_switch_|.
   base::Lock lookup_lock_;
 
   // Underlying persistent store for chunk data.
@@ -378,6 +385,7 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
   SBWhitelist csd_whitelist_;
   SBWhitelist download_whitelist_;
   SBWhitelist extension_blacklist_;
+  bool csd_malware_ipmatch_killswitch_on_;
 
   // Cached browse store related full-hash items, ordered by prefix for
   // efficient scanning.