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 84fa4d104f44f9151f8ad8bd1fbb53cdcb2478c9..10424afd139e37b654bad5a0b0d832d781655767 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -677,7 +677,7 @@ int QuicStreamFactory::CreateSession(
   *session = new QuicClientSession(
       connection, socket.Pass(), writer.Pass(), this,
       quic_crypto_client_stream_factory_, host_port_pair.host(),
-      config, crypto_config, net_log.net_log());
+      host_port_pair.port(), config, crypto_config, net_log.net_log());
   all_sessions_.insert(*session);  // owning pointer
   if (is_https) {
     crypto_config->SetProofVerifier(
@@ -716,6 +716,7 @@ QuicCryptoClientConfig* QuicStreamFactory::GetOrCreateCryptoConfig(
     if (quic_server_info_factory_) {
       QuicCryptoClientConfig::CachedState* cached =
           crypto_config->Create(session_key.host_port_pair.host(),
+                                session_key.host_port_pair.port(),
                                 quic_server_info_factory_);
       DCHECK(cached);
     }
@@ -761,7 +762,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,
+                                server_port,
                                 canonical_host_port_pair.host(),
+                                canonical_host_port_pair.port(),
                                 canonical_crypto_config);
   // Update canonical version to point at the "most recent" crypto_config.
   canonical_hostname_to_origin_map_[suffix_session_key] =