| Index: net/socket/ssl_server_socket_nss.cc
|
| diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
|
| index 5dd6eb8654c5ed72fcf3f6718e50a07661beca47..9286b1d3ace44bc16f7147084b8cb4b3050b3225 100644
|
| --- a/net/socket/ssl_server_socket_nss.cc
|
| +++ b/net/socket/ssl_server_socket_nss.cc
|
| @@ -201,7 +201,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(user_read_callback_.is_null());
|
| DCHECK(user_handshake_callback_.is_null());
|
| - DCHECK(!user_read_buf_);
|
| + DCHECK(!user_read_buf_.get());
|
| DCHECK(nss_bufs_);
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -224,7 +224,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
|
| int SSLServerSocketNSS::Write(IOBuffer* buf, int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(user_write_callback_.is_null());
|
| - DCHECK(!user_write_buf_);
|
| + DCHECK(!user_write_buf_.get());
|
| DCHECK(nss_bufs_);
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -495,7 +495,7 @@ void SSLServerSocketNSS::OnSendComplete(int result) {
|
| if (!completed_handshake_)
|
| return;
|
|
|
| - if (user_write_buf_) {
|
| + if (user_write_buf_.get()) {
|
| int rv = DoWriteLoop(result);
|
| if (rv != ERR_IO_PENDING)
|
| DoWriteCallback(rv);
|
| @@ -514,7 +514,7 @@ void SSLServerSocketNSS::OnRecvComplete(int result) {
|
|
|
| // Network layer received some data, check if client requested to read
|
| // decrypted data.
|
| - if (!user_read_buf_ || !completed_handshake_)
|
| + if (!user_read_buf_.get() || !completed_handshake_)
|
| return;
|
|
|
| int rv = DoReadLoop(result);
|
| @@ -550,7 +550,7 @@ int SSLServerSocketNSS::BufferSend(void) {
|
| memcpy(send_buffer->data(), buf1, len1);
|
| memcpy(send_buffer->data() + len1, buf2, len2);
|
| rv = transport_socket_->Write(
|
| - send_buffer, len,
|
| + send_buffer.get(), len,
|
| base::Bind(&SSLServerSocketNSS::BufferSendComplete,
|
| base::Unretained(this)));
|
| if (rv == ERR_IO_PENDING) {
|
| @@ -581,7 +581,7 @@ int SSLServerSocketNSS::BufferRecv(void) {
|
| } else {
|
| recv_buffer_ = new IOBuffer(nb);
|
| rv = transport_socket_->Read(
|
| - recv_buffer_, nb,
|
| + recv_buffer_.get(), nb,
|
| base::Bind(&SSLServerSocketNSS::BufferRecvComplete,
|
| base::Unretained(this)));
|
| if (rv == ERR_IO_PENDING) {
|
|
|