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

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

Issue 13896003: Don't set backup SafeBrowsing urls when kSbURLPrefix is specified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6efbd3475950acfd3a2a069aa3eca420e21cecc2..8c40f7b43cc9a7a8a60643e81be9ed2ea60cba82 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -358,13 +358,14 @@ void SafeBrowsingService::StartOnIOThread() {
config.disable_auto_update =
cmdline->HasSwitch(switches::kSbDisableAutoUpdate) ||
cmdline->HasSwitch(switches::kDisableBackgroundNetworking);
- config.url_prefix =
- cmdline->HasSwitch(switches::kSbURLPrefix) ?
- cmdline->GetSwitchValueASCII(switches::kSbURLPrefix) :
- kSbDefaultURLPrefix;
- config.backup_connect_error_url_prefix = kSbBackupConnectErrorURLPrefix;
- config.backup_http_error_url_prefix = kSbBackupHttpErrorURLPrefix;
- config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix;
+ if (cmdline->HasSwitch(switches::kSbURLPrefix)) {
+ config.url_prefix = cmdline->GetSwitchValueASCII(switches::kSbURLPrefix);
+ } else {
+ config.url_prefix = kSbDefaultURLPrefix;
+ config.backup_connect_error_url_prefix = kSbBackupConnectErrorURLPrefix;
+ config.backup_http_error_url_prefix = kSbBackupHttpErrorURLPrefix;
+ config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix;
+ }
#if defined(FULL_SAFE_BROWSING)
DCHECK(database_manager_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698