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

Unified Diff: google_apis/gcm/base/socket_stream.cc

Issue 498123003: Remove implicit conversions from scoped_refptr to T* in google_apis/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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 | « google_apis/gaia/oauth2_token_service_request.cc ('k') | google_apis/gcm/engine/connection_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/base/socket_stream.cc
diff --git a/google_apis/gcm/base/socket_stream.cc b/google_apis/gcm/base/socket_stream.cc
index 8c152c6c5b3604d8c3f14ee51c8260b54069e8cd..14889e1f1180d3e0b45ba3a1db6d517c7f012697 100644
--- a/google_apis/gcm/base/socket_stream.cc
+++ b/google_apis/gcm/base/socket_stream.cc
@@ -101,12 +101,12 @@ net::Error SocketInputStream::Refresh(const base::Closure& callback,
}
DVLOG(1) << "Refreshing input stream, limit of " << byte_limit << " bytes.";
- int result = socket_->Read(
- read_buffer_,
- byte_limit,
- base::Bind(&SocketInputStream::RefreshCompletionCallback,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ int result =
+ socket_->Read(read_buffer_.get(),
+ byte_limit,
+ base::Bind(&SocketInputStream::RefreshCompletionCallback,
+ weak_ptr_factory_.GetWeakPtr(),
+ callback));
DVLOG(1) << "Read returned " << result;
if (result == net::ERR_IO_PENDING) {
last_error_ = net::ERR_IO_PENDING;
@@ -256,12 +256,12 @@ net::Error SocketOutputStream::Flush(const base::Closure& callback) {
}
DVLOG(1) << "Flushing " << next_pos_ << " bytes into socket.";
- int result = socket_->Write(
- write_buffer_,
- next_pos_,
- base::Bind(&SocketOutputStream::FlushCompletionCallback,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ int result =
+ socket_->Write(write_buffer_.get(),
+ next_pos_,
+ base::Bind(&SocketOutputStream::FlushCompletionCallback,
+ weak_ptr_factory_.GetWeakPtr(),
+ callback));
DVLOG(1) << "Write returned " << result;
if (result == net::ERR_IO_PENDING) {
last_error_ = net::ERR_IO_PENDING;
« no previous file with comments | « google_apis/gaia/oauth2_token_service_request.cc ('k') | google_apis/gcm/engine/connection_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698