chrome/browser/safe_browsing/database_manager.cc - Issue 14999008: Add a killswitch for CSD malware IP match and report feature. Use a new killswitch whitelist URL wh…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/database_manager.cc

Issue 14999008: Add a killswitch for CSD malware IP match and report feature. Use a new killswitch whitelist URL wh… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review comment and add unittest Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/safe_browsing/database_manager.h ('k') | chrome/browser/safe_browsing/safe_browsing_database.h » ('j') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..1330adc5858150eae618b0e2e5ae65876bfa4447 100644

--- a/chrome/browser/safe_browsing/database_manager.cc

+++ b/chrome/browser/safe_browsing/database_manager.cc

@@ -276,6 +276,14 @@ bool SafeBrowsingDatabaseManager::MatchDownloadWhitelistString(

return database_->ContainsDownloadWhitelistedString(str);

}

+bool SafeBrowsingDatabaseManager::MalwareKillSwitchOn() {

+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

+ if (!enabled_ || !MakeDatabaseAvailable()) {

+ return true;

+ }

+ return database_->MalwareIPMatchKillSwitchOn();

bool SafeBrowsingDatabaseManager::CheckBrowseUrl(const GURL& url,

Client* client) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));