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

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

Issue 392373002: [safe browsing] Mobile requests different malware and phishing lists. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change hard-coded default lists for Android tests. Created 6 years, 5 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 | « no previous file | chrome/browser/safe_browsing/protocol_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 1877f60cc97ead8b46f699a0ac63d1303e87bf5d..84b09428e5104adf40929dee9bc197331563599e 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -213,6 +213,9 @@ SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
check_timeout_(base::TimeDelta::FromMilliseconds(kCheckTimeoutMs)) {
DCHECK(sb_service_.get() != NULL);
+ // Android only supports a subset of FULL_SAFE_BROWSING.
+ // TODO(shess): This shouldn't be OS-driven <http://crbug.com/394379>
+#if !defined(OS_ANDROID)
CommandLine* cmdline = CommandLine::ForCurrentProcess();
enable_download_protection_ =
!cmdline->HasSwitch(switches::kSbDisableDownloadProtection);
@@ -253,6 +256,7 @@ SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
UMA_HISTOGRAM_ENUMERATION("SB2.SideEffectFreeWhitelistStatus",
side_effect_free_whitelist_status,
SIDE_EFFECT_FREE_WHITELIST_STATUS_MAX);
+#endif
}
SafeBrowsingDatabaseManager::~SafeBrowsingDatabaseManager() {
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/protocol_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698