diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 21:21:13 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 21:21:13 +0000 |
| commit | 6ea7b15b65fdfab0875475b8c33e38dd1ed98889 (patch) | |
| tree | 6330991da0acf534ce1e0dbbaabd4bc2f3a0ef48 /net/socket/ssl_server_socket_nss.cc | |
| parent | b08ff47c9265ae172091ed75a14a73696fb5c2dc (diff) | |
| download | chromium_src-6ea7b15b65fdfab0875475b8c33e38dd1ed98889.zip chromium_src-6ea7b15b65fdfab0875475b8c33e38dd1ed98889.tar.gz chromium_src-6ea7b15b65fdfab0875475b8c33e38dd1ed98889.tar.bz2 | |
base::Bind: Finish converting net/socket.
BUG=none
TEST=none
R=groby
Review URL: http://codereview.chromium.org/9008004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_server_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_server_socket_nss.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index 9135464..0ff6559 100644 --- a/net/socket/ssl_server_socket_nss.cc +++ b/net/socket/ssl_server_socket_nss.cc @@ -60,7 +60,6 @@ SSLServerSocketNSS::SSLServerSocketNSS( const SSLConfig& ssl_config) : transport_send_busy_(false), transport_recv_busy_(false), - user_handshake_callback_(NULL), nss_fd_(NULL), nss_bufs_(NULL), transport_socket_(transport_socket), @@ -86,7 +85,7 @@ SSLServerSocketNSS::~SSLServerSocketNSS() { } } -int SSLServerSocketNSS::Handshake(OldCompletionCallback* callback) { +int SSLServerSocketNSS::Handshake(const CompletionCallback& callback) { net_log_.BeginEvent(NetLog::TYPE_SSL_SERVER_HANDSHAKE, NULL); int rv = Init(); @@ -145,7 +144,7 @@ int SSLServerSocketNSS::Connect(const CompletionCallback& callback) { int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback) { DCHECK(user_read_callback_.is_null()); - DCHECK(!user_handshake_callback_); + DCHECK(user_handshake_callback_.is_null()); DCHECK(!user_read_buf_); DCHECK(nss_bufs_); @@ -466,7 +465,7 @@ void SSLServerSocketNSS::OnHandshakeIOComplete(int result) { if (rv != ERR_IO_PENDING) { net_log_.EndEventWithNetErrorCode(net::NetLog::TYPE_SSL_SERVER_HANDSHAKE, rv); - if (user_handshake_callback_) + if (!user_handshake_callback_.is_null()) DoHandshakeCallback(rv); } } @@ -705,9 +704,9 @@ int SSLServerSocketNSS::DoHandshake() { void SSLServerSocketNSS::DoHandshakeCallback(int rv) { DCHECK_NE(rv, ERR_IO_PENDING); - OldCompletionCallback* c = user_handshake_callback_; - user_handshake_callback_ = NULL; - c->Run(rv > OK ? OK : rv); + CompletionCallback c = user_handshake_callback_; + user_handshake_callback_.Reset(); + c.Run(rv > OK ? OK : rv); } void SSLServerSocketNSS::DoReadCallback(int rv) { |