Revert 289433 "Refactor pooling logic into a helper method"

trunk/src/net/spdy/spdy_session_pool.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_pool.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
@@ skipping 13 matching lines @@
   IMPORTED_FROM_SOCKET        = 3,
   SPDY_SESSION_GET_MAX        = 4
 };
 
 }  // namespace
 
 SpdySessionPool::SpdySessionPool(
     HostResolver* resolver,
     SSLConfigService* ssl_config_service,
     const base::WeakPtr<HttpServerProperties>& http_server_properties,
-    TransportSecurityState* transport_security_state,
     bool force_single_domain,
     bool enable_compression,
     bool enable_ping_based_connection_checking,
     NextProto default_protocol,
     size_t stream_initial_recv_window_size,
     size_t initial_max_concurrent_streams,
     size_t max_concurrent_streams_limit,
     SpdySessionPool::TimeFunc time_func,
     const std::string& trusted_spdy_proxy)
     : http_server_properties_(http_server_properties),
-      transport_security_state_(transport_security_state),
       ssl_config_service_(ssl_config_service),
       resolver_(resolver),
       verify_domain_authentication_(true),
       enable_sending_initial_data_(true),
       force_single_domain_(force_single_domain),
       enable_compression_(enable_compression),
       enable_ping_based_connection_checking_(
           enable_ping_based_connection_checking),
       // TODO(akalin): Force callers to have a valid value of
       // |default_protocol_|.
@@ skipping 37 matching lines @@
     bool is_secure) {
   DCHECK_GE(default_protocol_, kProtoSPDYMinimumVersion);
   DCHECK_LE(default_protocol_, kProtoSPDYMaximumVersion);
 
   UMA_HISTOGRAM_ENUMERATION(
       "Net.SpdySessionGet", IMPORTED_FROM_SOCKET, SPDY_SESSION_GET_MAX);
 
   scoped_ptr<SpdySession> new_session(
       new SpdySession(key,
                       http_server_properties_,
-                      transport_security_state_,
                       verify_domain_authentication_,
                       enable_sending_initial_data_,
                       enable_compression_,
                       enable_ping_based_connection_checking_,
                       default_protocol_,
                       stream_initial_recv_window_size_,
                       initial_max_concurrent_streams_,
                       max_concurrent_streams_limit_,
                       time_func_,
                       trusted_spdy_proxy_,
@@ skipping 284 matching lines @@
 
     if (idle_only && (*it)->is_active())
       continue;
 
     (*it)->CloseSessionOnError(error, description);
     DCHECK(!IsSessionAvailable(*it));
   }
 }
 
 }  // namespace net