| Index: chrome/browser/safe_browsing/local_database_manager.cc
|
| diff --git a/chrome/browser/safe_browsing/local_database_manager.cc b/chrome/browser/safe_browsing/local_database_manager.cc
|
| index 0721b80942172862b4213bc56fbce3b2d2152cc1..0c3de5c2a3c03e72b0cd147873305f64308d9aa5 100644
|
| --- a/chrome/browser/safe_browsing/local_database_manager.cc
|
| +++ b/chrome/browser/safe_browsing/local_database_manager.cc
|
| @@ -268,6 +268,7 @@ LocalSafeBrowsingDatabaseManager::LocalSafeBrowsingDatabaseManager(
|
| enable_extension_blacklist_(false),
|
| enable_ip_blacklist_(false),
|
| enable_unwanted_software_blacklist_(true),
|
| + enable_module_whitelist_(true),
|
| update_in_progress_(false),
|
| database_update_in_progress_(false),
|
| closing_database_(false),
|
| @@ -433,6 +434,15 @@ bool LocalSafeBrowsingDatabaseManager::MatchInclusionWhitelistUrl(
|
| return database_->ContainsInclusionWhitelistedUrl(url);
|
| }
|
|
|
| +bool LocalSafeBrowsingDatabaseManager::MatchModuleWhitelistString(
|
| + const std::string& str) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| + if (!enabled_ || !enable_module_whitelist_ || !MakeDatabaseAvailable()) {
|
| + return true;
|
| + }
|
| + return database_->ContainsModuleWhitelistedString(str);
|
| +}
|
| +
|
| bool LocalSafeBrowsingDatabaseManager::IsMalwareKillSwitchOn() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (!enabled_ || !MakeDatabaseAvailable()) {
|
| @@ -780,7 +790,7 @@ SafeBrowsingDatabase* LocalSafeBrowsingDatabaseManager::GetDatabase() {
|
| safe_browsing_task_runner_, enable_download_protection_,
|
| enable_csd_whitelist_, enable_download_whitelist_,
|
| enable_extension_blacklist_, enable_ip_blacklist_,
|
| - enable_unwanted_software_blacklist_);
|
| + enable_unwanted_software_blacklist_, enable_module_whitelist_);
|
|
|
| database->Init(SafeBrowsingService::GetBaseFilename());
|
| {
|
|
|