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 /remoting/protocol | |
| 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 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/ssl_hmac_channel_authenticator.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc index 648e409..d5db72f 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc @@ -14,6 +14,7 @@ #include "net/cert/x509_certificate.h" #include "net/http/transport_security_state.h" #include "net/socket/client_socket_factory.h" +#include "net/socket/client_socket_handle.h" #include "net/socket/ssl_client_socket.h" #include "net/socket/ssl_server_socket.h" #include "net/ssl/ssl_config_service.h" @@ -103,9 +104,11 @@ void SslHmacChannelAuthenticator::SecureAndAuthenticate( net::SSLClientSocketContext context; context.cert_verifier = cert_verifier_.get(); context.transport_security_state = transport_security_state_.get(); + scoped_ptr<net::ClientSocketHandle> connection(new net::ClientSocketHandle); + connection->set_socket(socket.release()); socket_.reset( net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket( - socket.release(), host_and_port, ssl_config, context)); + connection.release(), host_and_port, ssl_config, context)); result = socket_->Connect( base::Bind(&SslHmacChannelAuthenticator::OnConnected, |