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_unittest.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_unittest.cc')
| -rw-r--r-- | net/socket/ssl_server_socket_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index f5034c2..86f444c 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -29,6 +29,7 @@ #include "net/base/address_list.h" #include "net/base/cert_status_flags.h" #include "net/base/cert_verifier.h" +#include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" @@ -326,9 +327,9 @@ TEST_F(SSLServerSocketTest, Handshake) { Initialize(); TestCompletionCallback connect_callback; - TestOldCompletionCallback handshake_callback; + TestCompletionCallback handshake_callback; - int server_ret = server_socket_->Handshake(&handshake_callback); + int server_ret = server_socket_->Handshake(handshake_callback.callback()); EXPECT_TRUE(server_ret == net::OK || server_ret == net::ERR_IO_PENDING); int client_ret = client_socket_->Connect(connect_callback.callback()); @@ -351,13 +352,13 @@ TEST_F(SSLServerSocketTest, DataTransfer) { Initialize(); TestCompletionCallback connect_callback; - TestOldCompletionCallback handshake_callback; + TestCompletionCallback handshake_callback; // Establish connection. int client_ret = client_socket_->Connect(connect_callback.callback()); ASSERT_TRUE(client_ret == net::OK || client_ret == net::ERR_IO_PENDING); - int server_ret = server_socket_->Handshake(&handshake_callback); + int server_ret = server_socket_->Handshake(handshake_callback.callback()); ASSERT_TRUE(server_ret == net::OK || server_ret == net::ERR_IO_PENDING); client_ret = connect_callback.GetResult(client_ret); @@ -435,12 +436,12 @@ TEST_F(SSLServerSocketTest, ExportKeyingMaterial) { Initialize(); TestCompletionCallback connect_callback; - TestOldCompletionCallback handshake_callback; + TestCompletionCallback handshake_callback; int client_ret = client_socket_->Connect(connect_callback.callback()); ASSERT_TRUE(client_ret == net::OK || client_ret == net::ERR_IO_PENDING); - int server_ret = server_socket_->Handshake(&handshake_callback); + int server_ret = server_socket_->Handshake(handshake_callback.callback()); ASSERT_TRUE(server_ret == net::OK || server_ret == net::ERR_IO_PENDING); if (client_ret == net::ERR_IO_PENDING) { |