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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket.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/pepper/pepper_tcp_socket.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
index 61ccdc2bafe5157b81294c6ad642c303292678b0..fe0a4e08eac5a36af69e28407ff405be396cebbd 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
@@ -168,7 +168,7 @@ void PepperTCPSocket::Read(int32 bytes_to_read) {
}
read_buffer_ = new net::IOBuffer(bytes_to_read);
- int result = socket_->Read(read_buffer_, bytes_to_read,
+ int result = socket_->Read(read_buffer_.get(), bytes_to_read,
base::Bind(&PepperTCPSocket::OnReadCompleted,
base::Unretained(this)));
if (result != net::ERR_IO_PENDING)
@@ -192,7 +192,8 @@ void PepperTCPSocket::Write(const std::string& data) {
write_buffer_base_ = new net::IOBuffer(data_size);
memcpy(write_buffer_base_->data(), data.data(), data_size);
- write_buffer_ = new net::DrainableIOBuffer(write_buffer_base_, data_size);
+ write_buffer_ =
+ new net::DrainableIOBuffer(write_buffer_base_.get(), data_size);
DoWrite();
}
@@ -271,7 +272,7 @@ bool PepperTCPSocket::GetCertificateFields(
net::X509Certificate::CreateFromBytes(der, length);
if (!cert.get())
return false;
- return GetCertificateFields(*cert, fields);
+ return GetCertificateFields(*cert.get(), fields);
}
void PepperTCPSocket::SendReadACKError() {
@@ -293,7 +294,7 @@ void PepperTCPSocket::SendSSLHandshakeACK(bool succeeded) {
net::SSLInfo ssl_info;
ssl_socket->GetSSLInfo(&ssl_info);
if (ssl_info.cert.get())
- GetCertificateFields(*ssl_info.cert, &certificate_fields);
+ GetCertificateFields(*ssl_info.cert.get(), &certificate_fields);
}
manager_->Send(new PpapiMsg_PPBTCPSocket_SSLHandshakeACK(
routing_id_,
@@ -410,9 +411,10 @@ void PepperTCPSocket::DoWrite() {
DCHECK(write_buffer_.get());
DCHECK_GT(write_buffer_->BytesRemaining(), 0);
- int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
- base::Bind(&PepperTCPSocket::OnWriteCompleted,
- base::Unretained(this)));
+ int result = socket_->
+ Write(write_buffer_.get(), write_buffer_->BytesRemaining(),
+ base::Bind(&PepperTCPSocket::OnWriteCompleted,
+ base::Unretained(this)));
if (result != net::ERR_IO_PENDING)
OnWriteCompleted(result);
}
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_udp.cc ('k') | content/browser/renderer_host/pepper/pepper_udp_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698