| Index: chrome/browser/safe_browsing/safe_browsing_service.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| index d640f1c3ffb52bfc71203a2eaea330a7f0b05925..ca0c5087f3781214bfaed20e95c2aacb5abf3fcf 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| @@ -161,6 +161,7 @@ SafeBrowsingService::SafeBrowsingService()
|
| enabled_(false),
|
| enable_download_protection_(false),
|
| enable_csd_whitelist_(false),
|
| + enable_download_whitelist_(false),
|
| update_in_progress_(false),
|
| database_update_in_progress_(false),
|
| closing_database_(false),
|
| @@ -687,7 +688,8 @@ SafeBrowsingDatabase* SafeBrowsingService::GetDatabase() {
|
|
|
| SafeBrowsingDatabase* database =
|
| SafeBrowsingDatabase::Create(enable_download_protection_,
|
| - enable_csd_whitelist_);
|
| + enable_csd_whitelist_,
|
| + enable_download_whitelist_);
|
|
|
| database->Init(path);
|
| {
|
| @@ -907,6 +909,9 @@ void SafeBrowsingService::Start() {
|
| local_state->GetBoolean(prefs::kMetricsReportingEnabled))));
|
| #endif
|
|
|
| + enable_download_whitelist_ = cmdline->HasSwitch(
|
| + switches::kEnableImprovedDownloadProtection);
|
| +
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
|
|