Restrict QUIC session pool when channel ID is present.

net/quic/quic_client_session.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.
 //
 // A client specific QuicSession subclass.  This class owns the underlying
 // QuicConnection and QuicConnectionHelper objects.  The connection stores
 // a non-owning pointer to the helper so this session needs to ensure that
 // the helper outlives the connection.
 
 #ifndef NET_QUIC_QUIC_CLIENT_SESSION_H_
@@ skipping 69 matching lines @@
     // if |session_| is destroyed while the stream request is still pending.
     void OnRequestCompleteFailure(int rv);
 
     base::WeakPtr<QuicClientSession> session_;
     CompletionCallback callback_;
     QuicReliableClientStream** stream_;
 
     DISALLOW_COPY_AND_ASSIGN(StreamRequest);
   };
 
-  // Constructs a new session which will own |connection| and |helper|, but
-  // not |stream_factory|, which must outlive this session.
+  // Constructs a new session connected to |host_port_pair| which will own

[wtc, 2014/07/01 23:00:14]

host_port_pair => server_host_port

[Ryan Hamilton, 2014/07/01 23:26:19]

Reverted this and just used server_id instead.

+  // |connection|, but not |stream_factory|, which must outlive this session.
   // TODO(rch): decouple the factory from the session via a Delegate interface.
-  QuicClientSession(QuicConnection* connection,
+  QuicClientSession(const HostPortPair& server_host_port,

[wtc, 2014/07/01 23:00:14]

IMPORTANT: the HostPortPair is readily available in the |server_id| parameter,
so this new parameter doesn't seem necessary.

[Ryan Hamilton, 2014/07/01 23:26:19]

Done.

+                    QuicConnection* connection,
                     scoped_ptr<DatagramClientSocket> socket,
                     scoped_ptr<QuicDefaultPacketWriter> writer,
                     QuicStreamFactory* stream_factory,
                     QuicCryptoClientStreamFactory* crypto_client_stream_factory,
                     scoped_ptr<QuicServerInfo> server_info,
                     const QuicServerId& server_id,
                     const QuicConfig& config,
                     QuicCryptoClientConfig* crypto_config,
                     base::TaskRunner* task_runner,
                     NetLog* net_log);
@@ skipping 108 matching lines @@
 
   // Posts a task to notify the factory that this session has been closed.
   void NotifyFactoryOfSessionClosedLater();
 
   // Notifies the factory that this session has been closed which will
   // delete |this|.
   void NotifyFactoryOfSessionClosed();
 
   void OnConnectTimeout();
 
+  const HostPortPair server_host_port_;
   bool require_confirmation_;
   scoped_ptr<QuicCryptoClientStream> crypto_stream_;
   QuicStreamFactory* stream_factory_;
   scoped_ptr<DatagramClientSocket> socket_;
   scoped_ptr<QuicDefaultPacketWriter> writer_;
   scoped_refptr<IOBufferWithSize> read_buffer_;
   scoped_ptr<QuicServerInfo> server_info_;
   scoped_ptr<CertVerifyResult> cert_verify_result_;
   ObserverSet observers_;
   StreamRequestQueue stream_requests_;
@@ skipping 10 matching lines @@
   // on this session. Existing stream will continue to be processed.
   bool going_away_;
   base::WeakPtrFactory<QuicClientSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClientSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CLIENT_SESSION_H_