Change WeakPtr<SpdyStream> to raw pointer in SpdyHttpStream.

net/spdy/spdy_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 816 matching lines @@
   SSLInfo ssl_info;
   if (!GetSSLInfo(&ssl_info))
     return true;   // This is not a secure session, so all domains are okay.
 
   return CanPool(transport_security_state_, ssl_info,
                  host_port_pair().host(), domain);
 }
 
 int SpdySession::GetPushStream(const GURL& url,
                                RequestPriority priority,
-                               base::WeakPtr<SpdyStream>* stream,
+                               SpdyStream** stream,
                                const NetLogWithSource& stream_net_log) {
   CHECK(!in_io_loop_);
 
-  stream->reset();
-
   if (availability_state_ == STATE_DRAINING)

[xunjieli, 2017/01/20 02:57:20]

I think we need to keep the original logic to reset *stream to null before this
line. If we return early without setting |*stream|, the pointer can be in an
uninitialized state.

*stream = nullptr;

[Bence, 2017/01/20 15:53:13]

Done.  I moved it to the if branch.  BTW the DCHECK in
SpdyHttpStream::InitializeStream() (the only non-test caller) guarantees that
|*stream| is already nullptr (or a null weakptr before this CL), but surely this
does not hurt.

[xunjieli, 2017/01/20 15:57:23]

Acknowledged. 

     return ERR_CONNECTION_CLOSED;
 
   *stream = GetActivePushStream(url);
   if (*stream) {
     DCHECK_LT(streams_pushed_and_claimed_count_, streams_pushed_count_);
     streams_pushed_and_claimed_count_++;
 
     // If the stream is still open, update its priority to match
     // the priority of the matching request.
     if (!(*stream)->IsClosed() && (*stream)->priority() != priority) {
@@ skipping 1124 matching lines @@
 }
 
 SpdyStreamId SpdySession::GetStreamIdForPush(const GURL& url) {
   UnclaimedPushedStreamContainer::const_iterator unclaimed_it =
       unclaimed_pushed_streams_.find(url);
   if (unclaimed_it == unclaimed_pushed_streams_.end())
     return 0;
   return unclaimed_it->second.stream_id;
 }
 
-base::WeakPtr<SpdyStream> SpdySession::GetActivePushStream(const GURL& url) {
+SpdyStream* SpdySession::GetActivePushStream(const GURL& url) {
   UnclaimedPushedStreamContainer::const_iterator unclaimed_it =
       unclaimed_pushed_streams_.find(url);
   if (unclaimed_it == unclaimed_pushed_streams_.end())
-    return base::WeakPtr<SpdyStream>();
+    return nullptr;
 
   SpdyStreamId stream_id = unclaimed_it->second.stream_id;
   unclaimed_pushed_streams_.erase(unclaimed_it);
 
   ActiveStreamMap::iterator active_it = active_streams_.find(stream_id);
   if (active_it == active_streams_.end()) {
     NOTREACHED();
-    return base::WeakPtr<SpdyStream>();
+    return nullptr;
   }
 
   net_log_.AddEvent(NetLogEventType::HTTP2_STREAM_ADOPTED_PUSH_STREAM,
                     base::Bind(&NetLogSpdyAdoptedPushStreamCallback,
                                active_it->second->stream_id(), &url));
-  return active_it->second->GetWeakPtr();
+  return active_it->second;
 }
 
 url::SchemeHostPort SpdySession::GetServer() {
   return url::SchemeHostPort(is_secure_ ? "https" : "http",
                              host_port_pair().host(), host_port_pair().port());
 }
 
 bool SpdySession::GetRemoteEndpoint(IPEndPoint* endpoint) {
   return GetPeerAddress(endpoint) == OK;
 }
@@ skipping 1101 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net