diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 21:37:12 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 21:37:12 +0000 |
| commit | 6104ea5d0b3eb19a923ae94a5f7fcae8e0e091e2 (patch) | |
| tree | 93a11c09778f638718cd19be3249e54defd1f90f /chrome/browser/io_thread.cc | |
| parent | 418e953e7285de2f29f6523c741cbca951f26562 (diff) | |
| download | chromium_src-6104ea5d0b3eb19a923ae94a5f7fcae8e0e091e2.zip chromium_src-6104ea5d0b3eb19a923ae94a5f7fcae8e0e091e2.tar.gz chromium_src-6104ea5d0b3eb19a923ae94a5f7fcae8e0e091e2.tar.bz2 | |
Stop refcounting ProxyService.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6873096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index fd3b443..faef46c 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -40,7 +40,6 @@ #include "net/base/host_resolver_impl.h" #include "net/base/mapped_host_resolver.h" #include "net/base/net_util.h" -#include "net/proxy/proxy_config_service.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_auth_filter.h" #include "net/http/http_auth_handler_factory.h" @@ -49,7 +48,9 @@ #if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" #endif // defined(USE_NSS) +#include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_script_fetcher_impl.h" +#include "net/proxy/proxy_service.h" #include "webkit/glue/webkit_glue.h" namespace { @@ -428,8 +429,8 @@ void IOThread::Init() { globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( globals_->host_resolver.get())); // For the ProxyScriptFetcher, we use a direct ProxyService. - globals_->proxy_script_fetcher_proxy_service = - net::ProxyService::CreateDirectWithNetLog(net_log_); + globals_->proxy_script_fetcher_proxy_service.reset( + net::ProxyService::CreateDirectWithNetLog(net_log_)); net::HttpNetworkSession::Params session_params; session_params.host_resolver = globals_->host_resolver.get(); session_params.cert_verifier = globals_->cert_verifier.get(); @@ -625,16 +626,16 @@ void IOThread::ClearHostCache() { void IOThread::InitSystemRequestContext() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - DCHECK(!globals_->system_proxy_service); + DCHECK(!globals_->system_proxy_service.get()); DCHECK(system_proxy_config_service_.get()); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - globals_->system_proxy_service = + globals_->system_proxy_service.reset( ProxyServiceFactory::CreateProxyService( net_log_, globals_->proxy_script_fetcher_context, system_proxy_config_service_.release(), - command_line); + command_line)); net::HttpNetworkSession::Params system_params; system_params.host_resolver = globals_->host_resolver.get(); system_params.cert_verifier = globals_->cert_verifier.get(); |