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

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp.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
Index: content/browser/renderer_host/p2p/socket_host_tcp.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 3f0d5252e481075c60a6cb65e6195e94eb4fc7a6..90c99f01214b0948143f326a5abf3357a4a932d1 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -108,7 +108,7 @@ void P2PSocketHostTcp::OnConnected(int result) {
void P2PSocketHostTcp::DoRead() {
int result;
do {
- if (!read_buffer_) {
+ if (!read_buffer_.get()) {
read_buffer_ = new net::GrowableIOBuffer();
read_buffer_->SetCapacity(kReadBufferSize);
} else if (read_buffer_->RemainingCapacity() < kReadBufferSize) {
@@ -119,9 +119,10 @@ void P2PSocketHostTcp::DoRead() {
read_buffer_->SetCapacity(read_buffer_->capacity() + kReadBufferSize -
read_buffer_->RemainingCapacity());
}
- result = socket_->Read(read_buffer_, read_buffer_->RemainingCapacity(),
- base::Bind(&P2PSocketHostTcp::OnRead,
- base::Unretained(this)));
+ result = socket_->
+ Read(read_buffer_.get(), read_buffer_->RemainingCapacity(),
+ base::Bind(&P2PSocketHostTcp::OnRead,
+ base::Unretained(this)));
DidCompleteRead(result);
} while (result > 0);
}
@@ -190,7 +191,7 @@ void P2PSocketHostTcp::Send(const net::IPEndPoint& to,
return;
}
- if (write_buffer_) {
+ if (write_buffer_.get()) {
// Silently drop packet if we haven't finished sending previous
// packet.
VLOG(1) << "Dropping TCP packet.";
@@ -227,9 +228,10 @@ void P2PSocketHostTcp::Send(const net::IPEndPoint& to,
void P2PSocketHostTcp::DoWrite() {
while (true) {
- int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
- base::Bind(&P2PSocketHostTcp::OnWritten,
- base::Unretained(this)));
+ int result = socket_->
+ Write(write_buffer_.get(), write_buffer_->BytesRemaining(),
+ base::Bind(&P2PSocketHostTcp::OnWritten,
+ base::Unretained(this)));
if (result >= 0) {
write_buffer_->DidConsume(result);
if (write_buffer_->BytesRemaining() == 0) {

Powered by Google App Engine
This is Rietveld 408576698