diff options
| author | mmenke <mmenke@chromium.org> | 2015-09-11 13:42:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 20:43:11 +0000 |
| commit | 468be2ff331c13b1a081d10a3c17e5366d26e577 (patch) | |
| tree | cee2dbcb52ab7a5af00b531b8e614255a88c7ba6 /jingle | |
| parent | 7c54a1d92f5d20997f58cdc70bd5b51a4a77efee (diff) | |
| download | chromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.zip chromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.tar.gz chromium_src-468be2ff331c13b1a081d10a3c17e5366d26e577.tar.bz2 | |
Remove reference counting from HttpNetworkSession.
This makes lifetime cleaner, and helps us avoid the case
where an HttpNetworkSession outlives the components it points
to.
Also remove some weird uses a null NetLog in GCM.
TBR=sgurun@chromium.org,davidben@chromium.org,droger@chromium.org
BUG=515947
Review URL: https://codereview.chromium.org/1298253002
Cr-Commit-Position: refs/heads/master@{#348483}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index 1fdb3ea..e71f362 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -90,7 +90,7 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( reference_params->use_alternative_services; } - network_session_ = new net::HttpNetworkSession(session_params); + network_session_.reset(new net::HttpNetworkSession(session_params)); } ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h index e8f22ce..14c8e24 100644 --- a/jingle/glue/proxy_resolving_client_socket.h +++ b/jingle/glue/proxy_resolving_client_socket.h @@ -89,7 +89,7 @@ class ProxyResolvingClientSocket : public net::StreamSocket { net::CompletionCallback proxy_resolve_callback_; net::CompletionCallback connect_callback_; - scoped_refptr<net::HttpNetworkSession> network_session_; + scoped_ptr<net::HttpNetworkSession> network_session_; // The transport socket. scoped_ptr<net::ClientSocketHandle> transport_; |