summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_server_socket_nss.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket/ssl_server_socket_nss.cc')
-rw-r--r--net/socket/ssl_server_socket_nss.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index dfec9d2..4316049 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -92,7 +92,7 @@ SSLServerSocketNSS::~SSLServerSocketNSS() {
}
}
-int SSLServerSocketNSS::Handshake(CompletionCallback* callback) {
+int SSLServerSocketNSS::Handshake(OldCompletionCallback* callback) {
net_log_.BeginEvent(NetLog::TYPE_SSL_SERVER_HANDSHAKE, NULL);
int rv = Init();
@@ -143,13 +143,13 @@ int SSLServerSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
return OK;
}
-int SSLServerSocketNSS::Connect(CompletionCallback* callback) {
+int SSLServerSocketNSS::Connect(OldCompletionCallback* callback) {
NOTIMPLEMENTED();
return ERR_NOT_IMPLEMENTED;
}
int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!user_read_callback_);
DCHECK(!user_handshake_callback_);
DCHECK(!user_read_buf_);
@@ -172,7 +172,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
}
int SSLServerSocketNSS::Write(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!user_write_callback_);
DCHECK(!user_write_buf_);
DCHECK(nss_bufs_);
@@ -706,7 +706,7 @@ int SSLServerSocketNSS::DoHandshake() {
void SSLServerSocketNSS::DoHandshakeCallback(int rv) {
DCHECK_NE(rv, ERR_IO_PENDING);
- CompletionCallback* c = user_handshake_callback_;
+ OldCompletionCallback* c = user_handshake_callback_;
user_handshake_callback_ = NULL;
c->Run(rv > OK ? OK : rv);
}
@@ -717,7 +717,7 @@ void SSLServerSocketNSS::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;
@@ -730,7 +730,7 @@ void SSLServerSocketNSS::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;