Land Recent QUIC changes.

net/quic/quic_crypto_server_stream.cc

Index: net/quic/quic_crypto_server_stream.cc
diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
index 57c10763689a919ff1f4cf29c0a77a2020331b88..c87c6d59f5a5efadb12411d8d2e4d319b12efba3 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -14,11 +14,9 @@
 namespace net {
 
 QuicCryptoServerStream::QuicCryptoServerStream(
-    const QuicConfig& config,
     const QuicCryptoServerConfig& crypto_config,
     QuicSession* session)
     : QuicCryptoStream(session),
-      config_(config),
       crypto_config_(crypto_config) {
 }
 
@@ -58,14 +56,15 @@ void QuicCryptoServerStream::OnHandshakeMessage(
   }
 
   // If we are returning a SHLO then we accepted the handshake.
-  error = config_.ProcessFinalPeerHandshake(
-      message, CryptoUtils::LOCAL_PRIORITY, &negotiated_params_,
-      &error_details);
+  QuicConfig* config = session()->config();
+  error = config->ProcessClientHello(message, &error_details);
   if (error != QUIC_NO_ERROR) {
     CloseConnectionWithDetails(error, error_details);
     return;
   }
 
+  config->ToHandshakeMessage(&reply);
+
   // Receiving a full CHLO implies the client is prepared to decrypt with
   // the new server write key.  We can start to encrypt with the new server
   // write key.