Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

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

Issue 1134603004: Remove the finch gate from the UWS interstitial (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 20565e811a05d382519448acde8f7a2eebb71c67..f00d0c672f96fa96743cdc3dc6bff6f21fcdb05c 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -260,7 +260,7 @@ SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
enable_download_whitelist_(false),
enable_extension_blacklist_(false),
enable_ip_blacklist_(false),
- enable_unwanted_software_blacklist_(false),
+ enable_unwanted_software_blacklist_(true),
update_in_progress_(false),
database_update_in_progress_(false),
closing_database_(false),
@@ -293,10 +293,6 @@ SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
// The client-side IP blacklist feature is tightly integrated with client-side
// phishing protection for now.
enable_ip_blacklist_ = enable_csd_whitelist_;
-
- // The UwS blacklist feature is controlled by a flag for M40.
- enable_unwanted_software_blacklist_ =
- safe_browsing_util::GetUnwantedTrialGroup() > safe_browsing_util::UWS_OFF;
#endif
}
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/safe_browsing_util.h » ('j') | chrome/browser/safe_browsing/safe_browsing_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698