summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_server_socket_nss.h
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/ssl_server_socket_nss.h
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/ssl_server_socket_nss.h')
-rw-r--r--net/socket/ssl_server_socket_nss.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h
index 9f13d4a..980464d 100644
--- a/net/socket/ssl_server_socket_nss.h
+++ b/net/socket/ssl_server_socket_nss.h
@@ -32,7 +32,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
virtual ~SSLServerSocketNSS();
// SSLServerSocket interface.
- virtual int Handshake(CompletionCallback* callback);
+ virtual int Handshake(OldCompletionCallback* callback);
virtual int ExportKeyingMaterial(const base::StringPiece& label,
const base::StringPiece& context,
unsigned char *out,
@@ -40,14 +40,14 @@ class SSLServerSocketNSS : public SSLServerSocket {
// Socket interface (via StreamSocket).
virtual int Read(IOBuffer* buf, int buf_len,
- CompletionCallback* callback);
+ OldCompletionCallback* callback);
virtual int Write(IOBuffer* buf, int buf_len,
- CompletionCallback* callback);
+ OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
// StreamSocket interface.
- virtual int Connect(CompletionCallback* callback);
+ virtual int Connect(OldCompletionCallback* callback);
virtual void Disconnect();
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;
@@ -98,8 +98,8 @@ class SSLServerSocketNSS : public SSLServerSocket {
virtual int Init();
// Members used to send and receive buffer.
- CompletionCallbackImpl<SSLServerSocketNSS> buffer_send_callback_;
- CompletionCallbackImpl<SSLServerSocketNSS> buffer_recv_callback_;
+ OldCompletionCallbackImpl<SSLServerSocketNSS> buffer_send_callback_;
+ OldCompletionCallbackImpl<SSLServerSocketNSS> buffer_recv_callback_;
bool transport_send_busy_;
bool transport_recv_busy_;
@@ -107,9 +107,9 @@ class SSLServerSocketNSS : public SSLServerSocket {
BoundNetLog net_log_;
- CompletionCallback* user_handshake_callback_;
- CompletionCallback* user_read_callback_;
- CompletionCallback* user_write_callback_;
+ OldCompletionCallback* user_handshake_callback_;
+ OldCompletionCallback* user_read_callback_;
+ OldCompletionCallback* user_write_callback_;
// Used by Read function.
scoped_refptr<IOBuffer> user_read_buf_;