Prevent over-preconnecting when we already have a SpdySession.

net/http/http_stream_request.cc

 // Copyright (c) 2010 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_request.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 474 matching lines @@
   using_ssl_ = request_info().url.SchemeIs("https") ||
       ShouldForceSpdySSL() || want_spdy_over_npn;
   using_spdy_ = false;
 
   // If spdy has been turned off on-the-fly, then there may be SpdySessions
   // still active.  But don't use them unless spdy is currently on.
   if (HttpStreamFactory::spdy_enabled()) {
     // Check first if we have a spdy session for this group.  If so, then go
     // straight to using that.
     HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server());
-    if (!preconnect_delegate_ &&
-        session_->spdy_session_pool()->HasSession(pair)) {
+    if (session_->spdy_session_pool()->HasSession(pair)) {
+      // If we're preconnecting, we're do need to preconnect anything since we
+      // already have a SpdySession, so we're done.
+      if (preconnect_delegate_)
+        return OK;
       using_spdy_ = true;
       next_state_ = STATE_CREATE_STREAM;
       return OK;
     }
     // Check next if we have a spdy session for this proxy.  If so, then go
     // straight to using that.
     if (IsHttpsProxyAndHttpUrl()) {
       HostPortProxyPair proxy(proxy_info()->proxy_server().host_port_pair(),
                               ProxyServer::Direct());
       if (session_->spdy_session_pool()->HasSession(proxy)) {
@@ skipping 586 matching lines @@
                                  base::TimeDelta::FromMinutes(6),
                                  100);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace net