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

Unified Diff: net/socket/socks5_client_socket.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 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/deterministic_socket_data_unittest.cc ('k') | net/socket/socks5_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks5_client_socket.cc
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index 8a3b78003e5e3e3100abea3bdb08212abd186507..d84761d66160f418b5c0bf4e997c04067c714f32 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -291,8 +291,8 @@ int SOCKS5ClientSocket::DoGreetWrite() {
handshake_buf_ = new IOBuffer(handshake_buf_len);
memcpy(handshake_buf_->data(), &buffer_.data()[bytes_sent_],
handshake_buf_len);
- return transport_->socket()->Write(handshake_buf_, handshake_buf_len,
- io_callback_);
+ return transport_->socket()
+ ->Write(handshake_buf_.get(), handshake_buf_len, io_callback_);
}
int SOCKS5ClientSocket::DoGreetWriteComplete(int result) {
@@ -314,8 +314,8 @@ int SOCKS5ClientSocket::DoGreetRead() {
next_state_ = STATE_GREET_READ_COMPLETE;
size_t handshake_buf_len = kGreetReadHeaderSize - bytes_received_;
handshake_buf_ = new IOBuffer(handshake_buf_len);
- return transport_->socket()->Read(handshake_buf_, handshake_buf_len,
- io_callback_);
+ return transport_->socket()
+ ->Read(handshake_buf_.get(), handshake_buf_len, io_callback_);
}
int SOCKS5ClientSocket::DoGreetReadComplete(int result) {
@@ -389,8 +389,8 @@ int SOCKS5ClientSocket::DoHandshakeWrite() {
handshake_buf_ = new IOBuffer(handshake_buf_len);
memcpy(handshake_buf_->data(), &buffer_[bytes_sent_],
handshake_buf_len);
- return transport_->socket()->Write(handshake_buf_, handshake_buf_len,
- io_callback_);
+ return transport_->socket()
+ ->Write(handshake_buf_.get(), handshake_buf_len, io_callback_);
}
int SOCKS5ClientSocket::DoHandshakeWriteComplete(int result) {
@@ -423,8 +423,8 @@ int SOCKS5ClientSocket::DoHandshakeRead() {
int handshake_buf_len = read_header_size - bytes_received_;
handshake_buf_ = new IOBuffer(handshake_buf_len);
- return transport_->socket()->Read(handshake_buf_, handshake_buf_len,
- io_callback_);
+ return transport_->socket()
+ ->Read(handshake_buf_.get(), handshake_buf_len, io_callback_);
}
int SOCKS5ClientSocket::DoHandshakeReadComplete(int result) {
« no previous file with comments | « net/socket/deterministic_socket_data_unittest.cc ('k') | net/socket/socks5_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698