Restrict QUIC session pool when channel ID is present.

net/quic/quic_client_session.h

Index: net/quic/quic_client_session.h
diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h
index 7fbe3db5cd1871dbfcff24fb8076bb03e4f5090b..13fc0998b214afc588d0f2caf3aae81b6fa60af4 100644
--- a/net/quic/quic_client_session.h
+++ b/net/quic/quic_client_session.h
@@ -87,10 +87,11 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
     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,
@@ -219,6 +220,7 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
 
   void OnConnectTimeout();
 
+  const HostPortPair server_host_port_;
   bool require_confirmation_;
   scoped_ptr<QuicCryptoClientStream> crypto_stream_;
   QuicStreamFactory* stream_factory_;