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

chrome/browser/safe_browsing/database_manager.cc

Index: chrome/browser/safe_browsing/database_manager.cc
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index 8658ac825fee358a8c649bbeabfc5374bba2bcef..6d1d82ec00e8defc8023664fa0939c4cfa5db8df 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -276,6 +276,10 @@ bool SafeBrowsingDatabaseManager::MatchDownloadWhitelistString(
   return database_->ContainsDownloadWhitelistedString(str);
 }
 
+bool SafeBrowsingDatabaseManager::MalwareKillSwitchOn() {
+  return database_->MalwareIPMatchKillSwitchOn();

[mattm, 2013/05/15 07:12:38]

Oops, didn't notice, I think this needs similar checks like the other methods
above before accessing database_

[kewang, 2013/05/15 13:45:07]

Done.

[mattm, 2013/05/15 23:46:26]

I think also the enabled and database available checks are needed here right?

[kewang, 2013/05/20 10:23:37]

Yes, added the check. Thanks,

+}
+
 bool SafeBrowsingDatabaseManager::CheckBrowseUrl(const GURL& url,
                                                  Client* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));