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 6f15f1cbe2adf7f03eba08d7e4483ba483363de3..05e62223461142b3ef28ec0c22d5c182e5276562 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc |
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc |
@@ -334,13 +334,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 |
@@ -368,6 +362,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(); |