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

Unified Diff: net/spdy/spdy_session.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/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 55251590843c05d5df24cd3faacad0e5dca617f3..170dc821c493111c5b087ddc7f8085669b5d4c4f 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -244,8 +244,8 @@ int SpdyStreamRequest::StartRequest(
RequestPriority priority,
const BoundNetLog& net_log,
const CompletionCallback& callback) {
- DCHECK(session);
- DCHECK(!session_);
+ DCHECK(session.get());
+ DCHECK(!session_.get());
DCHECK(!stream_);
DCHECK(callback_.is_null());
@@ -266,7 +266,7 @@ int SpdyStreamRequest::StartRequest(
}
void SpdyStreamRequest::CancelRequest() {
- if (session_)
+ if (session_.get())
session_->CancelStreamRequest(this);
Reset();
}
@@ -281,7 +281,7 @@ base::WeakPtr<SpdyStream> SpdyStreamRequest::ReleaseStream() {
void SpdyStreamRequest::OnRequestCompleteSuccess(
base::WeakPtr<SpdyStream>* stream) {
- DCHECK(session_);
+ DCHECK(session_.get());
DCHECK(!stream_);
DCHECK(!callback_.is_null());
CompletionCallback callback = callback_;
@@ -292,7 +292,7 @@ void SpdyStreamRequest::OnRequestCompleteSuccess(
}
void SpdyStreamRequest::OnRequestCompleteFailure(int rv) {
- DCHECK(session_);
+ DCHECK(session_.get());
DCHECK(!stream_);
DCHECK(!callback_.is_null());
CompletionCallback callback = callback_;
@@ -1200,7 +1200,7 @@ void SpdySession::WriteSocket() {
// it's okay to use GetIOBufferForRemainingData() since the socket
// doesn't use the IOBuffer past OnWriteComplete().
int rv = connection_->socket()->Write(
- write_io_buffer,
+ write_io_buffer.get(),
in_flight_write_->GetRemainingSize(),
base::Bind(&SpdySession::OnWriteComplete, weak_factory_.GetWeakPtr()));
// Avoid persisting |write_io_buffer| past |in_flight_write_|'s
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698