Fix crash in GetSpdySessionFromSSLSocket in the case where the...

net/spdy/spdy_session_pool.h

 // Copyright (c) 2009 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.
 
 #ifndef NET_SPDY_SPDY_SESSION_POOL_H_
 #define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <map>
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 class BoundNetLog;
 class ClientSocketHandle;
 class HttpNetworkSession;
 class NetworkChangeNotifier;
 class SpdySession;
 
@@ skipping 14 matching lines @@
   // Set the maximum concurrent sessions per domain.
   static void set_max_sessions_per_domain(int max) {
     if (max >= 1)
       g_max_sessions_per_domain = max;
   }
 
   // Builds a SpdySession from an existing SSL socket.  Users should try
   // calling Get() first to use an existing SpdySession so we don't get
   // multiple SpdySessions per domain.  Note that ownership of |connection| is
   // transferred from the caller to the SpdySession.
-  scoped_refptr<SpdySession> GetSpdySessionFromSSLSocket(
+  // Returns OK on success, and the |spdy_session| will be provided.
+  // Returns an error on failure, and |spdy_session| will be NULL.
+  net::Error GetSpdySessionFromSSLSocket(
       const HostPortPair& host_port_pair,
       HttpNetworkSession* session,
       ClientSocketHandle* connection,
-      const BoundNetLog& net_log);
+      const BoundNetLog& net_log,
+      scoped_refptr<SpdySession>& spdy_session);
 
   // TODO(willchan): Consider renaming to HasReusableSession, since perhaps we
   // should be creating a new session.
   bool HasSession(const HostPortPair& host_port_pair)const;
 
   // Close all Spdy Sessions; used for debugging.
   void CloseAllSessions() { RemoveAllSessions(true); }
 
   // Removes a SpdySession from the SpdySessionPool.
   void Remove(const scoped_refptr<SpdySession>& session);
@@ skipping 34 matching lines @@
   NetworkChangeNotifier* const network_change_notifier_;
 
   static int g_max_sessions_per_domain;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_