Landing 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 df8f0d8dc0e089947d308b3205757b535c7060a8..abf4bee2705738ffb75f6dd5e839dea552f9912d 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -9,6 +9,7 @@
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
+#include "net/quic/crypto/source_address_token.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
@@ -152,10 +153,11 @@ void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
 
   // Now that the handshake is complete, send an updated server config and
   // source-address token to the client.
-  SendServerConfigUpdate();
+  SendServerConfigUpdate(NULL);
 }
 
-void QuicCryptoServerStream::SendServerConfigUpdate() {
+void QuicCryptoServerStream::SendServerConfigUpdate(
+    const CachedNetworkParameters* cached_network_params) {
   if (session()->connection()->version() <= QUIC_VERSION_21) {
     return;
   }
@@ -165,7 +167,9 @@ void QuicCryptoServerStream::SendServerConfigUpdate() {
           session()->connection()->peer_address(),
           session()->connection()->clock(),
           session()->connection()->random_generator(),
-          crypto_negotiated_params_, &server_config_update_message)) {
+          crypto_negotiated_params_,
+          cached_network_params,
+          &server_config_update_message)) {
     DVLOG(1) << "Server: Failed to build server config update (SCUP)!";
     return;
   }