diff options
| author | rdsmith <rdsmith@chromium.org> | 2015-09-16 12:42:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 19:42:48 +0000 |
| commit | 82957ade8b7a9686c50688ab8caab3a19dcd80b1 (patch) | |
| tree | b0ff38f97b99a189b0c2d2e925787a33dc1a9224 /chromecast | |
| parent | a1c3501b272ca1c3f5ddc4f87c4ab397eba5af67 (diff) | |
| download | chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.zip chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.tar.gz chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.tar.bz2 | |
Shift URLRequestContextStorage over to taking scoped_ptrs.
Also includes converting several sources of scoped_ptrs for URLRequestContextStorage, including the ProxyService static generators and the ShellURLRequestContextGetter protected methods to be used by subclasses.
BUG=521705
Review URL: https://codereview.chromium.org/1290243007
Cr-Commit-Position: refs/heads/master@{#349194}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/browser/url_request_context_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc index c3b0f88..7729205 100644 --- a/chromecast/browser/url_request_context_factory.cc +++ b/chromecast/browser/url_request_context_factory.cc @@ -206,18 +206,18 @@ void URLRequestContextFactory::InitializeSystemContextDependencies() { new net::ChannelIDService(new net::DefaultChannelIDStore(NULL), base::WorkerPool::GetTaskRunner(true))); - cert_verifier_.reset(net::CertVerifier::CreateDefault()); + cert_verifier_ = net::CertVerifier::CreateDefault(); ssl_config_service_ = new net::SSLConfigServiceDefaults; transport_security_state_.reset(new net::TransportSecurityState()); - http_auth_handler_factory_.reset( - net::HttpAuthHandlerFactory::CreateDefault(host_resolver_.get())); + http_auth_handler_factory_ = + net::HttpAuthHandlerFactory::CreateDefault(host_resolver_.get()); http_server_properties_.reset(new net::HttpServerPropertiesImpl); - proxy_service_.reset(net::ProxyService::CreateUsingSystemProxyResolver( - proxy_config_service_.release(), 0, NULL)); + proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( + proxy_config_service_.release(), 0, NULL); system_dependencies_initialized_ = true; } |