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/ssl_client_socket_openssl.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/ssl_client_socket_openssl.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 52014ea..db9dc78 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -611,7 +611,7 @@ SSLClientSocket::NextProtoStatus SSLClientSocketOpenSSL::GetNextProto( void SSLClientSocketOpenSSL::DoReadCallback(int rv) { // Since Run may result in Read being called, clear |user_read_callback_| // up front. - CompletionCallback* c = user_read_callback_; + OldCompletionCallback* c = user_read_callback_; user_read_callback_ = NULL; user_read_buf_ = NULL; user_read_buf_len_ = 0; @@ -621,7 +621,7 @@ void SSLClientSocketOpenSSL::DoReadCallback(int rv) { void SSLClientSocketOpenSSL::DoWriteCallback(int rv) { // Since Run may result in Write being called, clear |user_write_callback_| // up front. - CompletionCallback* c = user_write_callback_; + OldCompletionCallback* c = user_write_callback_; user_write_callback_ = NULL; user_write_buf_ = NULL; user_write_buf_len_ = 0; @@ -630,7 +630,7 @@ void SSLClientSocketOpenSSL::DoWriteCallback(int rv) { // StreamSocket methods -int SSLClientSocketOpenSSL::Connect(CompletionCallback* callback) { +int SSLClientSocketOpenSSL::Connect(OldCompletionCallback* callback) { net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL); // Set up new ssl object. @@ -988,7 +988,7 @@ void SSLClientSocketOpenSSL::TransportReadComplete(int result) { } void SSLClientSocketOpenSSL::DoConnectCallback(int rv) { - CompletionCallback* c = user_connect_callback_; + OldCompletionCallback* c = user_connect_callback_; user_connect_callback_ = NULL; c->Run(rv > OK ? OK : rv); } @@ -1120,7 +1120,7 @@ base::TimeDelta SSLClientSocketOpenSSL::GetConnectTimeMicros() const { int SSLClientSocketOpenSSL::Read(IOBuffer* buf, int buf_len, - CompletionCallback* callback) { + OldCompletionCallback* callback) { user_read_buf_ = buf; user_read_buf_len_ = buf_len; @@ -1152,7 +1152,7 @@ int SSLClientSocketOpenSSL::DoReadLoop(int result) { int SSLClientSocketOpenSSL::Write(IOBuffer* buf, int buf_len, - CompletionCallback* callback) { + OldCompletionCallback* callback) { user_write_buf_ = buf; user_write_buf_len_ = buf_len; |