QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname

net/quic/quic_stream_factory.cc

Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index f445cd3e8f7a07579cc0fe7e5cab6cf3fa55ea5f..68931c4f0070a1efd79724e85bbdb81c52dcea93 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -619,7 +619,8 @@ int QuicStreamFactory::CreateSession(
   *session = new QuicClientSession(
       connection, socket.Pass(), writer.Pass(), this,
       quic_crypto_client_stream_factory_, host_port_proxy_pair.first.host(),
-      config, crypto_config, net_log.net_log());
+      host_port_proxy_pair.first.port(), config, crypto_config,
+      net_log.net_log());
   all_sessions_.insert(*session);  // owning pointer
   if (is_https) {
     crypto_config->SetProofVerifier(
@@ -658,6 +659,7 @@ QuicCryptoClientConfig* QuicStreamFactory::GetOrCreateCryptoConfig(
     if (quic_server_info_factory_) {
       QuicCryptoClientConfig::CachedState* cached =
           crypto_config->Create(host_port_proxy_pair.first.host(),
+                                host_port_proxy_pair.first.port(),
                                 quic_server_info_factory_);
       DCHECK(cached);
     }
@@ -701,7 +703,9 @@ void QuicStreamFactory::PopulateFromCanonicalConfig(
   // Copy the CachedState for the canonical server from canonical_crypto_config
   // as the initial CachedState for the server_hostname in crypto_config.
   crypto_config->InitializeFrom(server_hostname,
+                                host_port_proxy_pair.first.port(),
                                 canonical_host_port_proxy_pair.first.host(),
+                                canonical_host_port_proxy_pair.first.port(),
                                 canonical_crypto_config);
   // Update canonical version to point at the "most recent" crypto_config.
   canonical_hostname_to_origin_map_[canonical_host_port] = host_port_proxy_pair;