chrome/browser/safe_browsing/database_manager.cc - Issue 836963003: Add the result of the inclusion whitelist to the OffDomainInclusionDetector's analysis.

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 836963003: Add the result of the inclusion whitelist to the OffDomainInclusionDetector's analysis. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@#c1_sbDB_ODIsupport

Patch Set: fix test leak Created 5 years, 11 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/incident_reporting/off_domain_inclusion_detector.h » ('j') | chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.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 e6eb8156727a6a2578da98bd18784938b4cc42e6..2f89931e50aebce92e15a1c38d6b39a257741cfc 100644

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

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

@@ -438,6 +438,13 @@ bool SafeBrowsingDatabaseManager::MatchDownloadWhitelistString(

return database_->ContainsDownloadWhitelistedString(str);

}

+bool SafeBrowsingDatabaseManager::MatchInclusionWhitelistUrl(const GURL& url) {

+ DCHECK_CURRENTLY_ON(BrowserThread::IO);

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

+ return true;

+ return database_->ContainsInclusionWhitelistedUrl(url);

bool SafeBrowsingDatabaseManager::IsMalwareKillSwitchOn() {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

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