| 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 3a20a91e9472b72fbfe0e205fb26394e675d3034..d076309bb7fe8ae2550e5cf39325cad8bad7748a 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| @@ -336,13 +336,7 @@ void SafeBrowsingService::DestroyURLRequestContextOnIOThread() {
|
| url_request_context_.reset();
|
| }
|
|
|
| -void SafeBrowsingService::StartOnIOThread(
|
| - net::URLRequestContextGetter* url_request_context_getter) {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| - if (enabled_)
|
| - return;
|
| - enabled_ = true;
|
| -
|
| +SafeBrowsingProtocolConfig SafeBrowsingService::GetProtocolConfig() const {
|
| SafeBrowsingProtocolConfig config;
|
| // On Windows, get the safe browsing client name from the browser
|
| // distribution classes in installer util. These classes don't yet have
|
| @@ -370,6 +364,18 @@ void SafeBrowsingService::StartOnIOThread(
|
| config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix;
|
| }
|
|
|
| + return config;
|
| +}
|
| +
|
| +void SafeBrowsingService::StartOnIOThread(
|
| + net::URLRequestContextGetter* url_request_context_getter) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + if (enabled_)
|
| + return;
|
| + enabled_ = true;
|
| +
|
| + SafeBrowsingProtocolConfig config = GetProtocolConfig();
|
| +
|
| #if defined(FULL_SAFE_BROWSING)
|
| DCHECK(database_manager_.get());
|
| database_manager_->StartOnIOThread();
|
|
|