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 /jingle/notifier/base/fake_ssl_client_socket.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 'jingle/notifier/base/fake_ssl_client_socket.cc')
-rw-r--r-- | jingle/notifier/base/fake_ssl_client_socket.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jingle/notifier/base/fake_ssl_client_socket.cc b/jingle/notifier/base/fake_ssl_client_socket.cc index 20a3f39..2ab7ef5 100644 --- a/jingle/notifier/base/fake_ssl_client_socket.cc +++ b/jingle/notifier/base/fake_ssl_client_socket.cc @@ -99,14 +99,14 @@ FakeSSLClientSocket::FakeSSLClientSocket( FakeSSLClientSocket::~FakeSSLClientSocket() {} int FakeSSLClientSocket::Read(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { DCHECK_EQ(next_handshake_state_, STATE_NONE); DCHECK(handshake_completed_); return transport_socket_->Read(buf, buf_len, callback); } int FakeSSLClientSocket::Write(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { DCHECK_EQ(next_handshake_state_, STATE_NONE); DCHECK(handshake_completed_); return transport_socket_->Write(buf, buf_len, callback); @@ -120,7 +120,7 @@ bool FakeSSLClientSocket::SetSendBufferSize(int32 size) { return transport_socket_->SetSendBufferSize(size); } -int FakeSSLClientSocket::Connect(net::CompletionCallback* callback) { +int FakeSSLClientSocket::Connect(net::OldCompletionCallback* callback) { // We don't support synchronous operation, even if // |transport_socket_| does. DCHECK(callback); @@ -167,7 +167,7 @@ int FakeSSLClientSocket::DoHandshakeLoop() { void FakeSSLClientSocket::RunUserConnectCallback(int status) { DCHECK_LE(status, net::OK); next_handshake_state_ = STATE_NONE; - net::CompletionCallback* user_connect_callback = user_connect_callback_; + net::OldCompletionCallback* user_connect_callback = user_connect_callback_; user_connect_callback_ = NULL; user_connect_callback->Run(status); } |