diff options
| author | mmenke <mmenke@chromium.org> | 2015-10-13 10:16:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 17:17:29 +0000 |
| commit | e65e7af826f0a081c6e9704381e9604afe26ca09 (patch) | |
| tree | 8dd89f82fb3e174f293ec43c22ad8a908196b034 /jingle | |
| parent | 5187806982cdaf12248d947a3f12c544a1ae79b3 (diff) | |
| download | chromium_src-e65e7af826f0a081c6e9704381e9604afe26ca09.zip chromium_src-e65e7af826f0a081c6e9704381e9604afe26ca09.tar.gz chromium_src-e65e7af826f0a081c6e9704381e9604afe26ca09.tar.bz2 | |
Reland remove reference counting from HttpNetworkSession.
This was originally landed in
https://crrev.com/468be2ff331c13b1a081d10a3c17e5366d26e577
and reverted in https://crrev.com/6b3af6e07d19ebb3f86df612ee5a08c8dc8f78ab, due to
a new leak in a test causing bots to crash in a fun and exciting manner.
BUG=515947
TBR=sgurun@chromium.org,davidben@chromium.org,droger@chromium.org,zea@chromium.org
Review URL: https://codereview.chromium.org/1389743003
Cr-Commit-Position: refs/heads/master@{#353774}
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_; |