[SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool

net/http/http_stream_factory_impl.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/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 245 matching lines @@
   DCHECK_EQ(request_map_[job], request);
   DCHECK(!ContainsKey(orphaned_job_set_, job));
 
   request_map_.erase(job);
 
   orphaned_job_set_.insert(job);
   job->Orphan(request);
 }
 
 void HttpStreamFactoryImpl::OnNewSpdySessionReady(
-    scoped_refptr<SpdySession> spdy_session,
+    const base::WeakPtr<SpdySession>& spdy_session,
     bool direct,
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     bool was_npn_negotiated,
     NextProto protocol_negotiated,
     bool using_spdy,
     const BoundNetLog& net_log) {
-  const SpdySessionKey& spdy_session_key =
-      spdy_session->spdy_session_key();
-  while (!spdy_session->IsClosed()) {
-    // Each iteration may empty out the RequestSet for |spdy_session_key_ in
+  while (true) {
+    if (!spdy_session)
+      break;
+    const SpdySessionKey& spdy_session_key = spdy_session->spdy_session_key();
+    // Each iteration may empty out the RequestSet for |spdy_session_key| in
     // |spdy_session_request_map_|. So each time, check for RequestSet and use
     // the first one.
     //
     // TODO(willchan): If it's important, switch RequestSet out for a FIFO
-    // pqueue (Order by priority first, then FIFO within same priority). Unclear
+    // queue (Order by priority first, then FIFO within same priority). Unclear
     // that it matters here.
     if (!ContainsKey(spdy_session_request_map_, spdy_session_key))
       break;
     Request* request = *spdy_session_request_map_[spdy_session_key].begin();
     request->Complete(was_npn_negotiated,
                       protocol_negotiated,
                       using_spdy,
                       net_log);
     if (for_websockets_) {
       WebSocketStreamBase::Factory* factory =
           request->websocket_stream_factory();
       DCHECK(factory);
       bool use_relative_url = direct || request->url().SchemeIs("wss");
       request->OnWebSocketStreamReady(
           NULL,
           used_ssl_config,
           used_proxy_info,
-          factory->CreateSpdyStream(spdy_session.get(), use_relative_url));
+          factory->CreateSpdyStream(spdy_session, use_relative_url));
     } else {
       bool use_relative_url = direct || request->url().SchemeIs("https");
       request->OnStreamReady(
           NULL,
           used_ssl_config,
           used_proxy_info,
-          new SpdyHttpStream(spdy_session.get(), use_relative_url));
+          new SpdyHttpStream(spdy_session, use_relative_url));
     }
   }
   // TODO(mbelshe): Alert other valid requests.
 }
 
 void HttpStreamFactoryImpl::OnOrphanedJobComplete(const Job* job) {
   orphaned_job_set_.erase(job);
   delete job;
 }
 
@@ skipping 33 matching lines @@
        it != requests_to_fail.end(); ++it) {
     Request* request = *it;
     if (request == request_map_[job]) {
       continue;
     }
     request->OnStreamFailed(NULL, status, used_ssl_config);
   }
 }
 
 }  // namespace net