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..1a7b9b0aa388fc25b79cd0fcb1f8d15bc5704ba3 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;
 
+uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
+

[mattm, 2013/05/13 20:39:25]

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

[kewang, 2013/05/14 08:21:41]

yes, this should be place to declare the virtural GetMalwareKillSwitch().

   // 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,11 @@ 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 GetMalwareKillSwitch() const {

[mattm, 2013/05/13 20:39:25]

name the function and the variable more precisely, so that it is not confused
with other SB malware checking

[kewang, 2013/05/14 08:21:41]

Done.

+    return malware_kill_switch_;

[mattm, 2013/05/13 20:39:25]

If you are wrapping the setting of this member with lookup_lock_, it should be
used here too.

[kewang, 2013/05/14 08:21:41]

Done.

[kewang, 2013/05/14 08:21:41]

Done.

+  } OVERRIDE;

[mattm, 2013/05/13 20:39:25]

OVERRIDE goes before the {}.
Wait, this isn't actually an override, was it supposed to be declared up there
at the uuuuuuuuuuuuuu?

+
  private:
   friend class SafeBrowsingDatabaseTest;
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingDatabaseTest, HashCaching);
@@ -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 malware_kill_switch_;
 
   // Cached browse store related full-hash items, ordered by prefix for
   // efficient scanning.