diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 01:43:18 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 01:43:18 +0000 |
| commit | e3850f2872aafd38bf91e1a48b8e8677847a8e5b (patch) | |
| tree | 2c53fa7a84f08ee4ac52656fa29e4706e3066250 /net/socket_stream | |
| parent | a8f942845fefa262e9a9fe7e778bc5eda1760bb6 (diff) | |
| download | chromium_src-e3850f2872aafd38bf91e1a48b8e8677847a8e5b.zip chromium_src-e3850f2872aafd38bf91e1a48b8e8677847a8e5b.tar.gz chromium_src-e3850f2872aafd38bf91e1a48b8e8677847a8e5b.tar.bz2 | |
Remove deprecated functions that take StreamSockets instead of handles
BUG=37810
Review URL: https://chromiumcodereview.appspot.com/22794008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index dca994c..ab4c3fd 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -33,6 +33,7 @@ #include "net/http/http_transaction_factory.h" #include "net/http/http_util.h" #include "net/socket/client_socket_factory.h" +#include "net/socket/client_socket_handle.h" #include "net/socket/socks5_client_socket.h" #include "net/socket/socks_client_socket.h" #include "net/socket/ssl_client_socket.h" @@ -953,15 +954,17 @@ int SocketStream::DoSOCKSConnect() { next_state_ = STATE_SOCKS_CONNECT_COMPLETE; - StreamSocket* s = socket_.release(); HostResolver::RequestInfo req_info(HostPortPair::FromURL(url_)); DCHECK(!proxy_info_.is_empty()); - if (proxy_info_.proxy_server().scheme() == ProxyServer::SCHEME_SOCKS5) - s = new SOCKS5ClientSocket(s, req_info); - else - s = new SOCKSClientSocket(s, req_info, context_->host_resolver()); - socket_.reset(s); + scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); + connection->set_socket(socket_.release()); + if (proxy_info_.proxy_server().scheme() == ProxyServer::SCHEME_SOCKS5) { + socket_.reset(new SOCKS5ClientSocket(connection.release(), req_info)); + } else { + socket_.reset(new SOCKSClientSocket( + connection.release(), req_info, context_->host_resolver())); + } metrics_->OnCountConnectionType(SocketStreamMetrics::SOCKS_CONNECTION); return socket_->Connect(io_callback_); } @@ -986,8 +989,10 @@ int SocketStream::DoSecureProxyConnect() { ssl_context.cert_verifier = context_->cert_verifier(); ssl_context.transport_security_state = context_->transport_security_state(); ssl_context.server_bound_cert_service = context_->server_bound_cert_service(); + scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); + connection->set_socket(socket_.release()); socket_.reset(factory_->CreateSSLClientSocket( - socket_.release(), + connection.release(), proxy_info_.proxy_server().host_port_pair(), proxy_ssl_config_, ssl_context)); @@ -1040,7 +1045,9 @@ int SocketStream::DoSSLConnect() { ssl_context.cert_verifier = context_->cert_verifier(); ssl_context.transport_security_state = context_->transport_security_state(); ssl_context.server_bound_cert_service = context_->server_bound_cert_service(); - socket_.reset(factory_->CreateSSLClientSocket(socket_.release(), + scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); + connection->set_socket(socket_.release()); + socket_.reset(factory_->CreateSSLClientSocket(connection.release(), HostPortPair::FromURL(url_), server_ssl_config_, ssl_context)); |