summaryrefslogtreecommitdiffstats
path: root/net/socket/tcp_client_socket_unittest.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/socket/tcp_client_socket_unittest.cc
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback. Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g. BUG=98719 TEST=none Review URL: http://codereview.chromium.org/8070013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_unittest.cc')
-rw-r--r--net/socket/tcp_client_socket_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc
index edb3c20..4abce1f 100644
--- a/net/socket/tcp_client_socket_unittest.cc
+++ b/net/socket/tcp_client_socket_unittest.cc
@@ -38,10 +38,10 @@ TEST(TCPClientSocketTest, BindLoopbackToLoopback) {
EXPECT_EQ(OK, socket.Bind(IPEndPoint(lo_address, 0)));
- TestCompletionCallback connect_callback;
+ TestOldCompletionCallback connect_callback;
EXPECT_EQ(ERR_IO_PENDING, socket.Connect(&connect_callback));
- TestCompletionCallback accept_callback;
+ TestOldCompletionCallback accept_callback;
scoped_ptr<StreamSocket> accepted_socket;
int result = server.Accept(&accepted_socket, &accept_callback);
if (result == ERR_IO_PENDING)
@@ -63,7 +63,7 @@ TEST(TCPClientSocketTest, BindLoopbackToExternal) {
ASSERT_TRUE(ParseIPLiteralToNumber("127.0.0.1", &lo_address));
EXPECT_EQ(OK, socket.Bind(IPEndPoint(lo_address, 0)));
- TestCompletionCallback connect_callback;
+ TestOldCompletionCallback connect_callback;
int result = socket.Connect(&connect_callback);
if (result == ERR_IO_PENDING)
result = connect_callback.WaitForResult();
@@ -97,7 +97,7 @@ TEST(TCPClientSocketTest, BindLoopbackToIPv6) {
ASSERT_TRUE(ParseIPLiteralToNumber("127.0.0.1", &ipv4_lo_ip));
EXPECT_EQ(OK, socket.Bind(IPEndPoint(ipv4_lo_ip, 0)));
- TestCompletionCallback connect_callback;
+ TestOldCompletionCallback connect_callback;
int result = socket.Connect(&connect_callback);
if (result == ERR_IO_PENDING)
result = connect_callback.WaitForResult();