Skip to content

GitLab

T
tangled
Commit 9fccd8ed authored by mattm@chromium.org's avatar mattm@chromium.org
Browse files
Options

Don't set backup SafeBrowsing urls when kSbURLPrefix is specified. 

BUG=233039

Review URL: https://chromiumcodereview.appspot.com/13896003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195060 0039d316-1c4b-4281-b951-d872f2087c98
parent 7d6cd2e1
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
chrome/browser/safe_browsing/safe_browsing_service.cc
View file @ 9fccd8ed
...@@ -358,13 +358,14 @@ void SafeBrowsingService::StartOnIOThread() { ...@@ -358,13 +358,14 @@ void SafeBrowsingService::StartOnIOThread() {
config.disable_auto_update = config.disable_auto_update =
cmdline->HasSwitch(switches::kSbDisableAutoUpdate) || cmdline->HasSwitch(switches::kSbDisableAutoUpdate) ||
cmdline->HasSwitch(switches::kDisableBackgroundNetworking); cmdline->HasSwitch(switches::kDisableBackgroundNetworking);
config.url_prefix = if (cmdline->HasSwitch(switches::kSbURLPrefix)) {
cmdline->HasSwitch(switches::kSbURLPrefix) ? config.url_prefix = cmdline->GetSwitchValueASCII(switches::kSbURLPrefix);
cmdline->GetSwitchValueASCII(switches::kSbURLPrefix) : } else {
kSbDefaultURLPrefix; config.url_prefix = kSbDefaultURLPrefix;
config.backup_connect_error_url_prefix = kSbBackupConnectErrorURLPrefix; config.backup_connect_error_url_prefix = kSbBackupConnectErrorURLPrefix;
config.backup_http_error_url_prefix = kSbBackupHttpErrorURLPrefix; config.backup_http_error_url_prefix = kSbBackupHttpErrorURLPrefix;
config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix; config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix;
}
#if defined(FULL_SAFE_BROWSING) #if defined(FULL_SAFE_BROWSING)
DCHECK(database_manager_); DCHECK(database_manager_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment