Remove many-many SpdyMajorVersion and NextProto arguments and members.

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 <stddef.h>
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/cert/cert_database.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_server.h"
-#include "net/socket/next_proto.h"
 #include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace net {
 
 class AddressList;
 class BoundNetLog;
 class ClientSocketHandle;
 class HostResolver;
 class HttpServerProperties;
 class ProxyDelegate;
 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,
                   HttpServerProperties* http_server_properties,
                   TransportSecurityState* transport_security_state,
                   bool enable_ping_based_connection_checking,
                   bool enable_priority_dependencies,
-                  NextProto default_protocol,
                   size_t session_max_recv_window_size,
                   size_t stream_max_recv_window_size,
                   SpdySessionPool::TimeFunc time_func,
                   ProxyDelegate* proxy_delegate);
   ~SpdySessionPool() override;
 
   // In the functions below, a session is "available" if this pool has
   // a reference to it and there is some SpdySessionKey for which
   // FindAvailableSession() will return it. A session is "unavailable"
   // if this pool has a reference to it but it won't be returned by
   // FindAvailableSession() for any SpdySessionKey; for example, this
   // can happen when a session receives a GOAWAY frame and is still
   // processing existing streams.
 
   // Create a new SPDY session from an existing socket.  There must
-  // not already be a session for the given key. This pool must have
-  // been constructed with a valid |default_protocol| value.
+  // not already be a session for the given key.
   //
   // |is_secure| can be false for testing or when SPDY is configured
   // to work with non-secure sockets. If |is_secure| is true,
   // |certificate_error_code| indicates that the certificate error
   // encountered when connecting the SSL socket, with OK meaning there
   // was no error.
   //
   // Returns the new SpdySession. Note that the SpdySession begins reading from
   // |connection| on a subsequent event loop iteration, so it may be closed
   // immediately afterwards if the first read of |connection| fails.
@@ skipping 135 matching lines @@
   UnclaimedPushedStreamMap unclaimed_pushed_streams_;
 
   const scoped_refptr<SSLConfigService> ssl_config_service_;
   HostResolver* const resolver_;
 
   // Defaults to true. May be controlled via SpdySessionPoolPeer for tests.
   bool verify_domain_authentication_;
   bool enable_sending_initial_data_;
   bool enable_ping_based_connection_checking_;
   const bool enable_priority_dependencies_;
-  const NextProto default_protocol_;
   size_t session_max_recv_window_size_;
   size_t stream_max_recv_window_size_;
   TimeFunc time_func_;
 
   // Determines if a proxy is a trusted SPDY proxy, which is allowed to push
   // resources from origins that are different from those of their associated
   // streams. May be nullptr.
   ProxyDelegate* proxy_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_