Revert 290320 "Refactor pooling logic into a helper method"

trunk/src/net/spdy/spdy_session_pool.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_SESSION_POOL_H_
 #define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 16 matching lines @@
 #include "net/ssl/ssl_config_service.h"
 
 namespace net {
 
 class AddressList;
 class BoundNetLog;
 class ClientSocketHandle;
 class HostResolver;
 class HttpServerProperties;
 class SpdySession;
-class TransportSecurityState;
 
 // This is a very simple pool for open SpdySessions.
 class NET_EXPORT SpdySessionPool
     : public NetworkChangeNotifier::IPAddressObserver,
       public SSLConfigService::Observer,
       public CertDatabase::Observer {
  public:
   typedef base::TimeTicks (*TimeFunc)(void);
 
   // |default_protocol| may be kProtoUnknown (e.g., if SPDY is
   // disabled), in which case it's set to a default value. Otherwise,
   // it must be a SPDY protocol.
   SpdySessionPool(
       HostResolver* host_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);
   virtual ~SpdySessionPool();
@@ skipping 121 matching lines @@
   // Close only the currently existing SpdySessions with |error|.  Let
   // any new ones created while this method is running continue to
   // live. If |idle_only| is true only idle sessions are closed.
   void CloseCurrentSessionsHelper(
       Error error,
       const std::string& description,
       bool idle_only);
 
   const base::WeakPtr<HttpServerProperties> http_server_properties_;
 
-  TransportSecurityState* transport_security_state_;
-
   // The set of all sessions. This is a superset of the sessions in
   // |available_sessions_|.
   //
   // |sessions_| owns all its SpdySession objects.
   SessionSet sessions_;
 
   // This is a map of available sessions by key. A session may appear
   // more than once in this map if it has aliases.
   AvailableSessionMap available_sessions_;
 
@@ skipping 20 matching lines @@
   // This SPDY proxy is allowed to push resources from origins that are
   // different from those of their associated streams.
   HostPortPair trusted_spdy_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_