Update net/ to use WeakPtr<T>::get() instead of implicit "operator T*"

BUG=245942

Review URL: https://chromiumcodereview.appspot.com/15881011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203633 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 55 insertions, 55 deletions

diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index 642da2c..5bcd82c 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -49,9 +49,9 @@ void SpdyHttpStream::InitializeWithExistingStream(
 }
 
 SpdyHttpStream::~SpdyHttpStream() {
-  if (stream_) {
+  if (stream_.get()) {
     stream_->DetachDelegate();
-    DCHECK(!stream_);
+    DCHECK(!stream_.get());
   }
 }
 
@@ -71,7 +71,7 @@ int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
       return error;
 
     // |stream_| may be NULL even if OK was returned.
-    if (stream_) {
+    if (stream_.get()) {
       DCHECK_EQ(stream_->type(), SPDY_PUSH_STREAM);
       stream_->SetDelegate(this);
       return OK;
@@ -109,7 +109,7 @@ int SpdyHttpStream::ReadResponseHeaders(const CompletionCallback& callback) {
   if (stream_closed_)
     return closed_stream_status_;
 
-  CHECK(stream_);
+  CHECK(stream_.get());
 
   // Check if we already have the response headers. If so, return synchronously.
   if(stream_->response_received()) {
@@ -125,7 +125,7 @@ int SpdyHttpStream::ReadResponseHeaders(const CompletionCallback& callback) {
 
 int SpdyHttpStream::ReadResponseBody(
     IOBuffer* buf, int buf_len, const CompletionCallback& callback) {
-  if (stream_) {
+  if (stream_.get()) {
     CHECK(stream_->is_idle());
     CHECK(!stream_->closed());
   }
@@ -187,7 +187,7 @@ bool SpdyHttpStream::GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const {
   // The reused flag can only be correctly set once a stream has an ID.  Streams
   // get their IDs once the request has been successfully sent, so this does not
   // behave that differently from other stream types.
-  if (!spdy_session_.get() || (!stream_ && !stream_closed_))
+  if (!spdy_session_.get() || (!stream_.get() && !stream_closed_))
     return false;
 
   SpdyStreamId stream_id =
@@ -282,9 +282,9 @@ int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
 
 void SpdyHttpStream::Cancel() {
   callback_.Reset();
-  if (stream_) {
+  if (stream_.get()) {
     stream_->Cancel();
-    DCHECK(!stream_);
+    DCHECK(!stream_.get());
   }
 }
 
@@ -389,7 +389,7 @@ void SpdyHttpStream::OnDataSent() {
 }
 
 void SpdyHttpStream::OnClose(int status) {
-  if (stream_) {
+  if (stream_.get()) {
     stream_closed_ = true;
     closed_stream_status_ = status;
     closed_stream_id_ = stream_->stream_id();
@@ -492,7 +492,7 @@ bool SpdyHttpStream::DoBufferedReadCallback() {
 
   // If the transaction is cancelled or errored out, we don't need to complete
   // the read.
-  if (!stream_ && !stream_closed_)
+  if (!stream_.get() && !stream_closed_)
     return false;
 
   int stream_status =
@@ -531,7 +531,7 @@ void SpdyHttpStream::DoCallback(int rv) {
 }
 
 void SpdyHttpStream::GetSSLInfo(SSLInfo* ssl_info) {
-  DCHECK(stream_);
+  DCHECK(stream_.get());
   bool using_npn;
   NextProto protocol_negotiated = kProtoUnknown;
   stream_->GetSSLInfo(ssl_info, &using_npn, &protocol_negotiated);
@@ -539,7 +539,7 @@ void SpdyHttpStream::GetSSLInfo(SSLInfo* ssl_info) {
 
 void SpdyHttpStream::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
-  DCHECK(stream_);
+  DCHECK(stream_.get());
   stream_->GetSSLCertRequestInfo(cert_request_info);
 }
 
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index bfbc722..279a30b 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -137,11 +137,11 @@ void SpdyProxyClientSocket::Disconnect() {
 
   next_state_ = STATE_DISCONNECTED;
 
-  if (spdy_stream_) {
+  if (spdy_stream_.get()) {
     // This will cause OnClose to be invoked, which takes care of
     // cleaning up all the internal state.
     spdy_stream_->Cancel();
-    DCHECK(!spdy_stream_);
+    DCHECK(!spdy_stream_.get());
   }
 }
 
@@ -167,7 +167,7 @@ void SpdyProxyClientSocket::SetOmniboxSpeculation() {
 }
 
 bool SpdyProxyClientSocket::WasEverUsed() const {
-  return was_ever_used_ || (spdy_stream_ && spdy_stream_->WasEverUsed());
+  return was_ever_used_ || (spdy_stream_.get() && spdy_stream_->WasEverUsed());
 }
 
 bool SpdyProxyClientSocket::UsingTCPFastOpen() const {
@@ -225,7 +225,7 @@ int SpdyProxyClientSocket::Write(IOBuffer* buf, int buf_len,
   if (next_state_ != STATE_OPEN)
     return ERR_SOCKET_NOT_CONNECTED;
 
-  DCHECK(spdy_stream_);
+  DCHECK(spdy_stream_.get());
   spdy_stream_->SendData(buf, buf_len, MORE_DATA_TO_SEND);
   net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_SENT,
                                 buf_len, buf->data());
@@ -408,7 +408,7 @@ int SpdyProxyClientSocket::DoReadReplyComplete(int result) {
         // Immediately hand off our SpdyStream to a newly created
         // SpdyHttpStream so that any subsequent SpdyFrames are processed in
         // the context of the HttpStream, not the socket.
-        DCHECK(spdy_stream_);
+        DCHECK(spdy_stream_.get());
         base::WeakPtr<SpdyStream> stream = spdy_stream_;
         spdy_stream_.reset();
         response_stream_.reset(new SpdyHttpStream(NULL, false));
@@ -518,7 +518,7 @@ void SpdyProxyClientSocket::OnClose(int status)  {
     OnDataReceived(scoped_ptr<SpdyBuffer>());
   }
   // This may have been deleted by read_callback_, so check first.
-  if (weak_ptr && !write_callback.is_null())
+  if (weak_ptr.get() && !write_callback.is_null())
     write_callback.Run(ERR_CONNECTION_CLOSED);
 }
 
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 170dc82..1e71a27 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -246,7 +246,7 @@ int SpdyStreamRequest::StartRequest(
     const CompletionCallback& callback) {
   DCHECK(session.get());
   DCHECK(!session_.get());
-  DCHECK(!stream_);
+  DCHECK(!stream_.get());
   DCHECK(callback_.is_null());
 
   type_ = type;
@@ -274,7 +274,7 @@ void SpdyStreamRequest::CancelRequest() {
 base::WeakPtr<SpdyStream> SpdyStreamRequest::ReleaseStream() {
   DCHECK(!session_.get());
   base::WeakPtr<SpdyStream> stream = stream_;
-  DCHECK(stream);
+  DCHECK(stream.get());
   Reset();
   return stream;
 }
@@ -282,18 +282,18 @@ base::WeakPtr<SpdyStream> SpdyStreamRequest::ReleaseStream() {
 void SpdyStreamRequest::OnRequestCompleteSuccess(
     base::WeakPtr<SpdyStream>* stream) {
   DCHECK(session_.get());
-  DCHECK(!stream_);
+  DCHECK(!stream_.get());
   DCHECK(!callback_.is_null());
   CompletionCallback callback = callback_;
   Reset();
-  DCHECK(*stream);
+  DCHECK(stream->get());
   stream_ = *stream;
   callback.Run(OK);
 }
 
 void SpdyStreamRequest::OnRequestCompleteFailure(int rv) {
   DCHECK(session_.get());
-  DCHECK(!stream_);
+  DCHECK(!stream_.get());
   DCHECK(!callback_.is_null());
   CompletionCallback callback = callback_;
   Reset();
@@ -923,7 +923,7 @@ void SpdySession::CloseCreatedStream(
   DCHECK_EQ(0u, stream->stream_id());
 
   scoped_ptr<SpdyStream> owned_stream(stream.get());
-  created_streams_.erase(stream);
+  created_streams_.erase(stream.get());
 
   DeleteStream(owned_stream.Pass(), status);
 }
@@ -1100,7 +1100,7 @@ void SpdySession::OnWriteComplete(int result) {
     if (in_flight_write_->GetRemainingSize() == 0) {
       // It is possible that the stream was cancelled while we were
       // writing to the socket.
-      if (in_flight_write_stream_) {
+      if (in_flight_write_stream_.get()) {
         DCHECK_GT(in_flight_write_frame_size_, 0u);
         in_flight_write_stream_->OnFrameWriteComplete(
             in_flight_write_frame_type_,
@@ -1162,13 +1162,13 @@ void SpdySession::WriteSocket() {
       if (!write_queue_.Dequeue(&frame_type, &producer, &stream))
         break;
 
-      if (stream)
+      if (stream.get())
         DCHECK(!stream->closed());
 
       // Activate the stream only when sending the SYN_STREAM frame to
       // guarantee monotonically-increasing stream IDs.
       if (frame_type == SYN_STREAM) {
-        if (stream && stream->stream_id() == 0) {
+        if (stream.get() && stream->stream_id() == 0) {
           scoped_ptr<SpdyStream> owned_stream =
               ActivateCreatedStream(stream.get());
           InsertActivatedStream(owned_stream.Pass());
@@ -1441,7 +1441,7 @@ void SpdySession::InsertActivatedStream(scoped_ptr<SpdyStream> stream) {
 }
 
 void SpdySession::DeleteStream(scoped_ptr<SpdyStream> stream, int status) {
-  if (in_flight_write_stream_ == stream.get()) {
+  if (in_flight_write_stream_.get() == stream.get()) {
     // If we're deleting the stream for the in-flight write, we still
     // need to let the write complete, so we clear
     // |in_flight_write_stream_| and let the write finish on its own
@@ -2259,10 +2259,10 @@ void SpdySession::CompleteStreamRequest(SpdyStreamRequest* pending_request) {
   pending_stream_request_completions_.erase(it);
 
   if (rv == OK) {
-    DCHECK(stream);
+    DCHECK(stream.get());
     pending_request->OnRequestCompleteSuccess(&stream);
   } else {
-    DCHECK(!stream);
+    DCHECK(!stream.get());
     pending_request->OnRequestCompleteFailure(rv);
   }
 }
diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
index 5ac87d6..961b0bc 100644
--- a/net/spdy/spdy_session_spdy3_unittest.cc
+++ b/net/spdy/spdy_session_spdy3_unittest.cc
@@ -3032,13 +3032,13 @@ void SpdySessionSpdy3Test::RunResumeAfterUnstallTest31(
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
-  stall_fn.Run(session.get(), stream);
+  stall_fn.Run(session.get(), stream.get());
 
   data.RunFor(2);
 
   EXPECT_TRUE(stream->send_stalled_by_flow_control());
 
-  unstall_function.Run(session.get(), stream, kBodyDataSize);
+  unstall_function.Run(session.get(), stream.get(), kBodyDataSize);
 
   EXPECT_FALSE(stream->send_stalled_by_flow_control());
 
@@ -3259,7 +3259,7 @@ class StreamClosingDelegate : public test::StreamDelegateWithBody {
 
   virtual void OnDataSent() OVERRIDE {
     test::StreamDelegateWithBody::OnDataSent();
-    if (stream_to_close_) {
+    if (stream_to_close_.get()) {
       stream_to_close_->Close();
       EXPECT_EQ(NULL, stream_to_close_.get());
     }
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index cc4fd2d..3c57676 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -59,13 +59,13 @@ class SpdyStream::SynStreamBufferProducer : public SpdyBufferProducer {
  public:
   SynStreamBufferProducer(const base::WeakPtr<SpdyStream>& stream)
       : stream_(stream) {
-    DCHECK(stream_);
+    DCHECK(stream_.get());
   }
 
   virtual ~SynStreamBufferProducer() {}
 
   virtual scoped_ptr<SpdyBuffer> ProduceBuffer() OVERRIDE {
-    if (!stream_) {
+    if (!stream_.get()) {
       NOTREACHED();
       return scoped_ptr<SpdyBuffer>();
     }
diff --git a/net/spdy/spdy_stream_test_util.cc b/net/spdy/spdy_stream_test_util.cc
index 3fd48bb..8024f8f 100644
--- a/net/spdy/spdy_stream_test_util.cc
+++ b/net/spdy/spdy_stream_test_util.cc
@@ -35,9 +35,9 @@ int ClosingDelegate::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
 void ClosingDelegate::OnDataSent() {}
 
 void ClosingDelegate::OnClose(int status) {
-  DCHECK(stream_);
+  DCHECK(stream_.get());
   stream_->Close();
-  DCHECK(!stream_);
+  DCHECK(!stream_.get());
 }
 
 StreamDelegateBase::StreamDelegateBase(
@@ -74,7 +74,7 @@ int StreamDelegateBase::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
 void StreamDelegateBase::OnDataSent() {}
 
 void StreamDelegateBase::OnClose(int status) {
-  if (!stream_)
+  if (!stream_.get())
     return;
   stream_id_ = stream_->stream_id();
   stream_.reset();
diff --git a/net/spdy/spdy_stream_test_util.h b/net/spdy/spdy_stream_test_util.h
index fb2520d..3641536 100644
--- a/net/spdy/spdy_stream_test_util.h
+++ b/net/spdy/spdy_stream_test_util.h
@@ -35,7 +35,7 @@ class ClosingDelegate : public SpdyStream::Delegate {
   virtual void OnClose(int status) OVERRIDE;
 
   // Returns whether or not the stream is closed.
-  bool StreamIsClosed() const { return !stream_; }
+  bool StreamIsClosed() const { return !stream_.get(); }
 
  private:
   base::WeakPtr<SpdyStream> stream_;
@@ -65,7 +65,7 @@ class StreamDelegateBase : public SpdyStream::Delegate {
   std::string TakeReceivedData();
 
   // Returns whether or not the stream is closed.
-  bool StreamIsClosed() const { return !stream_; }
+  bool StreamIsClosed() const { return !stream_.get(); }
 
   // Returns the stream's ID. If called when the stream is closed,
   // returns the stream's ID when it was open.
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index 0713c9a..3363d51 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -45,14 +45,14 @@ int SpdyWebSocketStream::InitializeStream(const GURL& url,
 
   if (rv == OK) {
     stream_ = stream_request_.ReleaseStream();
-    DCHECK(stream_);
+    DCHECK(stream_.get());
     stream_->SetDelegate(this);
   }
   return rv;
 }
 
 int SpdyWebSocketStream::SendRequest(scoped_ptr<SpdyHeaderBlock> headers) {
-  if (!stream_) {
+  if (!stream_.get()) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
@@ -63,7 +63,7 @@ int SpdyWebSocketStream::SendRequest(scoped_ptr<SpdyHeaderBlock> headers) {
 }
 
 int SpdyWebSocketStream::SendData(const char* data, int length) {
-  if (!stream_) {
+  if (!stream_.get()) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
@@ -76,9 +76,9 @@ int SpdyWebSocketStream::SendData(const char* data, int length) {
 }
 
 void SpdyWebSocketStream::Close() {
-  if (stream_) {
+  if (stream_.get()) {
     stream_->Close();
-    DCHECK(!stream_);
+    DCHECK(!stream_.get());
   }
 }
 
@@ -121,7 +121,7 @@ void SpdyWebSocketStream::OnSpdyStreamCreated(int result) {
   DCHECK_NE(ERR_IO_PENDING, result);
   if (result == OK) {
     stream_ = stream_request_.ReleaseStream();
-    DCHECK(stream_);
+    DCHECK(stream_.get());
     stream_->SetDelegate(this);
   }
   DCHECK(delegate_);
diff --git a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
index 7b72321..be91009 100644
--- a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
@@ -354,7 +354,7 @@ TEST_F(SpdyWebSocketStreamSpdy2Test, Basic) {
   GURL url("ws://example.com/echo");
   ASSERT_EQ(OK, websocket_stream_->InitializeStream(url, HIGHEST, net_log));
 
-  ASSERT_TRUE(websocket_stream_->stream_);
+  ASSERT_TRUE(websocket_stream_->stream_.get());
 
   SendRequest();
 
diff --git a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
index 6ce2901..d6e3479 100644
--- a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
@@ -355,7 +355,7 @@ TEST_F(SpdyWebSocketStreamSpdy3Test, Basic) {
   GURL url("ws://example.com/echo");
   ASSERT_EQ(OK, websocket_stream_->InitializeStream(url, HIGHEST, net_log));
 
-  ASSERT_TRUE(websocket_stream_->stream_);
+  ASSERT_TRUE(websocket_stream_->stream_.get());
 
   SendRequest();
 
diff --git a/net/spdy/spdy_write_queue.cc b/net/spdy/spdy_write_queue.cc
index b4e7376..2e17977 100644
--- a/net/spdy/spdy_write_queue.cc
+++ b/net/spdy/spdy_write_queue.cc
@@ -22,7 +22,7 @@ SpdyWriteQueue::PendingWrite::PendingWrite(
     : frame_type(frame_type),
       frame_producer(frame_producer),
       stream(stream),
-      has_stream(stream != NULL) {}
+      has_stream(stream.get() != NULL) {}
 
 SpdyWriteQueue::PendingWrite::~PendingWrite() {}
 
@@ -36,7 +36,7 @@ void SpdyWriteQueue::Enqueue(RequestPriority priority,
                              SpdyFrameType frame_type,
                              scoped_ptr<SpdyBufferProducer> frame_producer,
                              const base::WeakPtr<SpdyStream>& stream) {
-  if (stream)
+  if (stream.get())
     DCHECK_EQ(stream->priority(), priority);
   queue_[priority].push_back(
       PendingWrite(frame_type, frame_producer.release(), stream));
@@ -53,7 +53,7 @@ bool SpdyWriteQueue::Dequeue(SpdyFrameType* frame_type,
       frame_producer->reset(pending_write.frame_producer);
       *stream = pending_write.stream;
       if (pending_write.has_stream)
-        DCHECK(*stream);
+        DCHECK(stream->get());
       return true;
     }
   }
@@ -62,7 +62,7 @@ bool SpdyWriteQueue::Dequeue(SpdyFrameType* frame_type,
 
 void SpdyWriteQueue::RemovePendingWritesForStream(
     const base::WeakPtr<SpdyStream>& stream) {
-  DCHECK(stream);
+  DCHECK(stream.get());
   if (DCHECK_IS_ON()) {
     // |stream| should not have pending writes in a queue not matching
     // its priority.
@@ -81,7 +81,7 @@ void SpdyWriteQueue::RemovePendingWritesForStream(
   std::deque<PendingWrite>::iterator out_it = queue->begin();
   for (std::deque<PendingWrite>::const_iterator it = queue->begin();
        it != queue->end(); ++it) {
-    if (it->stream == stream) {
+    if (it->stream.get() == stream.get()) {
       delete it->frame_producer;
     } else {
       *out_it = *it;
@@ -99,8 +99,8 @@ void SpdyWriteQueue::RemovePendingWritesForStreamsAfter(
     std::deque<PendingWrite>::iterator out_it = queue->begin();
     for (std::deque<PendingWrite>::const_iterator it = queue->begin();
          it != queue->end(); ++it) {
-      if (it->stream && (it->stream->stream_id() > last_good_stream_id ||
-                         it->stream->stream_id() == 0)) {
+      if (it->stream.get() && (it->stream->stream_id() > last_good_stream_id ||
+                               it->stream->stream_id() == 0)) {
         delete it->frame_producer;
       } else {
         *out_it = *it;