Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config.h

Index: net/quic/crypto/quic_crypto_server_config.h
diff --git a/net/quic/crypto/quic_crypto_server_config.h b/net/quic/crypto/quic_crypto_server_config.h
index 031097232efc004001e2e75b23a5c4f5cc1a434c..7c9ed428586796315b9c8120017a5d4cec3f8974 100644
--- a/net/quic/crypto/quic_crypto_server_config.h
+++ b/net/quic/crypto/quic_crypto_server_config.h
@@ -179,7 +179,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
   // validate_chlo_result: Output from the asynchronous call to
   //     ValidateClientHello.  Contains the client hello message and
   //     information about it.
-  // guid: the GUID for the connection, which is used in key derivation.
+  // connection_id: the ConnectionId for the connection, which is used in key
+  //     derivation.
   // client_address: the IP address and port of the client. The IP address is
   //     used to generate and validate source-address tokens.
   // version: version of the QUIC protocol in use for this connection
@@ -194,7 +195,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
   // error_details: used to store a string describing any error.
   QuicErrorCode ProcessClientHello(
       const ValidateClientHelloResultCallback::Result& validate_chlo_result,
-      QuicGuid guid,
+      QuicConnectionId connection_id,
       IPEndPoint client_address,
       QuicVersion version,
       const QuicVersionVector& supported_versions,