Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Unified Diff: net/socket/ssl_server_socket_nss.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/tcp_server_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/tcp_server_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698