Land Recent QUIC Changes.

net/quic/quic_crypto_client_stream.cc

 // 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.
 
 #include "net/quic/quic_crypto_client_stream.h"
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 191 matching lines @@
           }
           out.set_minimum_size(max_packet_size - kFramingOverhead);
           next_state_ = STATE_RECV_REJ;
           DVLOG(1) << "Client: Sending " << out.DebugString();
           SendHandshakeMessage(out);
           return;
         }
         session()->config()->ToHandshakeMessage(&out);
         error = crypto_config_->FillClientHello(
             server_hostname_,
-            session()->connection()->guid(),
+            session()->connection()->connection_id(),
             session()->connection()->supported_versions().front(),
             cached,
             session()->connection()->clock()->WallNow(),
             session()->connection()->random_generator(),
             &crypto_negotiated_params_,
             &out,
             &error_details);
         if (error != QUIC_NO_ERROR) {
           // Flush the cached config so that, if it's bad, the server has a
           // chance to send us another in the future.
@@ skipping 134 matching lines @@
         // alternative_decrypter will be NULL if the original alternative
         // decrypter latched and became the primary decrypter. That happens
         // if we received a message encrypted with the INITIAL key.
         if (session()->connection()->alternative_decrypter() != NULL) {
           // The server hello was sent without encryption.
           CloseConnectionWithDetails(QUIC_CRYPTO_ENCRYPTION_LEVEL_INCORRECT,
                                      "unencrypted SHLO message");
           return;
         }
         error = crypto_config_->ProcessServerHello(
-            *in, session()->connection()->guid(),
+            *in, session()->connection()->connection_id(),
             session()->connection()->server_supported_versions(),
             cached, &crypto_negotiated_params_, &error_details);
 
         if (error != QUIC_NO_ERROR) {
           CloseConnectionWithDetails(
               error, "Server hello invalid: " + error_details);
           return;
         }
         error = session()->config()->ProcessServerHello(*in, &error_details);
         if (error != QUIC_NO_ERROR) {
@@ skipping 87 matching lines @@
   ProofVerifier* verifier = crypto_config_->proof_verifier();
   if (!verifier) {
     // If no verifier is set then we don't check the certificates.
     cached->SetProofValid();
   } else if (!cached->signature().empty()) {
     next_state_ = STATE_VERIFY_PROOF;
   }
 }
 
 }  // namespace net