diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
| commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
| tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/socket/tcp_server_socket_unittest.cc | |
| parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
| download | chromium_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_server_socket_unittest.cc')
| -rw-r--r-- | net/socket/tcp_server_socket_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/socket/tcp_server_socket_unittest.cc b/net/socket/tcp_server_socket_unittest.cc index 5b5b9f5..8c36dca 100644 --- a/net/socket/tcp_server_socket_unittest.cc +++ b/net/socket/tcp_server_socket_unittest.cc @@ -77,12 +77,12 @@ class TCPServerSocketTest : public PlatformTest { TEST_F(TCPServerSocketTest, Accept) { ASSERT_NO_FATAL_FAILURE(SetUpIPv4()); - TestCompletionCallback connect_callback; + TestOldCompletionCallback connect_callback; TCPClientSocket connecting_socket(local_address_list(), NULL, NetLog::Source()); connecting_socket.Connect(&connect_callback); - TestCompletionCallback accept_callback; + TestOldCompletionCallback accept_callback; scoped_ptr<StreamSocket> accepted_socket; int result = socket_.Accept(&accepted_socket, &accept_callback); if (result == ERR_IO_PENDING) @@ -102,12 +102,12 @@ TEST_F(TCPServerSocketTest, Accept) { TEST_F(TCPServerSocketTest, AcceptAsync) { ASSERT_NO_FATAL_FAILURE(SetUpIPv4()); - TestCompletionCallback accept_callback; + TestOldCompletionCallback accept_callback; scoped_ptr<StreamSocket> accepted_socket; ASSERT_EQ(ERR_IO_PENDING, socket_.Accept(&accepted_socket, &accept_callback)); - TestCompletionCallback connect_callback; + TestOldCompletionCallback connect_callback; TCPClientSocket connecting_socket(local_address_list(), NULL, NetLog::Source()); connecting_socket.Connect(&connect_callback); @@ -126,25 +126,25 @@ TEST_F(TCPServerSocketTest, AcceptAsync) { TEST_F(TCPServerSocketTest, Accept2Connections) { ASSERT_NO_FATAL_FAILURE(SetUpIPv4()); - TestCompletionCallback accept_callback; + TestOldCompletionCallback accept_callback; scoped_ptr<StreamSocket> accepted_socket; ASSERT_EQ(ERR_IO_PENDING, socket_.Accept(&accepted_socket, &accept_callback)); - TestCompletionCallback connect_callback; + TestOldCompletionCallback connect_callback; TCPClientSocket connecting_socket(local_address_list(), NULL, NetLog::Source()); connecting_socket.Connect(&connect_callback); - TestCompletionCallback connect_callback2; + TestOldCompletionCallback connect_callback2; TCPClientSocket connecting_socket2(local_address_list(), NULL, NetLog::Source()); connecting_socket2.Connect(&connect_callback2); EXPECT_EQ(OK, accept_callback.WaitForResult()); - TestCompletionCallback accept_callback2; + TestOldCompletionCallback accept_callback2; scoped_ptr<StreamSocket> accepted_socket2; int result = socket_.Accept(&accepted_socket2, &accept_callback2); if (result == ERR_IO_PENDING) @@ -169,12 +169,12 @@ TEST_F(TCPServerSocketTest, AcceptIPv6) { if (!initialized) return; - TestCompletionCallback connect_callback; + TestOldCompletionCallback connect_callback; TCPClientSocket connecting_socket(local_address_list(), NULL, NetLog::Source()); connecting_socket.Connect(&connect_callback); - TestCompletionCallback accept_callback; + TestOldCompletionCallback accept_callback; scoped_ptr<StreamSocket> accepted_socket; int result = socket_.Accept(&accepted_socket, &accept_callback); if (result == ERR_IO_PENDING) |