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

net/quic/quic_crypto_client_stream.cc

Index: net/quic/quic_crypto_client_stream.cc
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index ab32cf0fc0ce21569046f379865e90b5e5f6e759..0ce377894f1e1d186b0d3822ad4b2e384ab59af0 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -67,14 +67,14 @@ void QuicCryptoClientStream::ProofVerifierCallbackImpl::Cancel() {
 
 
 QuicCryptoClientStream::QuicCryptoClientStream(
-    const string& server_hostname,
+    const QuicSessionKey& session_key,

[wtc, 2014/03/13 22:22:03]

Nit: this parameter probably should be named |server_key| to be more
descriptive.

[ramant (doing other things), 2014/03/13 23:46:36]

Done.

     QuicSession* session,
     QuicCryptoClientConfig* crypto_config)
     : QuicCryptoStream(session),
       next_state_(STATE_IDLE),
       num_client_hellos_(0),
       crypto_config_(crypto_config),
-      server_hostname_(server_hostname),
+      session_key_(session_key),
       generation_counter_(0),
       proof_verify_callback_(NULL),
       disk_cache_load_result_(ERR_UNEXPECTED),
@@ -153,7 +153,7 @@ void QuicCryptoClientStream::DoHandshakeLoop(
   QuicErrorCode error;
   string error_details;
   QuicCryptoClientConfig::CachedState* cached =
-      crypto_config_->LookupOrCreate(server_hostname_);
+      crypto_config_->LookupOrCreate(session_key_);
 
   if (in != NULL) {
     DVLOG(1) << "Client: Received " << in->DebugString();
@@ -184,7 +184,7 @@ void QuicCryptoClientStream::DoHandshakeLoop(
 
         if (!cached->IsComplete(session()->connection()->clock()->WallNow())) {
           crypto_config_->FillInchoateClientHello(
-              server_hostname_,
+              session_key_.host_port_pair().host(),
               session()->connection()->supported_versions().front(),
               cached, &crypto_negotiated_params_, &out);
           // Pad the inchoate client hello to fill up a packet.
@@ -210,7 +210,7 @@ void QuicCryptoClientStream::DoHandshakeLoop(
         }
         session()->config()->ToHandshakeMessage(&out);
         error = crypto_config_->FillClientHello(
-            server_hostname_,
+            session_key_.host_port_pair().host(),
             session()->connection()->connection_id(),
             session()->connection()->supported_versions().front(),
             cached,
@@ -297,7 +297,7 @@ void QuicCryptoClientStream::DoHandshakeLoop(
         verify_ok_ = false;
 
         ProofVerifier::Status status = verifier->VerifyProof(
-            server_hostname_,
+            session_key_.host_port_pair().host(),
             cached->server_config(),
             cached->certs(),
             cached->signature(),