Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config.cc

Index: net/quic/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/crypto/quic_crypto_server_config.cc b/net/quic/crypto/quic_crypto_server_config.cc
index 65db0f54878518cd3c4c6058b6f09d2242fecb92..c8114ff110b27e094027b079890fe27b542056db 100644
--- a/net/quic/crypto/quic_crypto_server_config.cc
+++ b/net/quic/crypto/quic_crypto_server_config.cc
@@ -490,7 +490,6 @@ QuicErrorCode QuicCryptoServerConfig::ProcessClientHello(
     IPEndPoint client_address,
     QuicVersion version,
     const QuicVersionVector& supported_versions,
-    uint32 initial_flow_control_window_bytes,
     const QuicClock* clock,
     QuicRandom* rand,
     QuicCryptoNegotiatedParameters *params,
@@ -739,9 +738,6 @@ QuicErrorCode QuicCryptoServerConfig::ProcessClientHello(
   out->SetStringPiece(kCADR, address_coder.Encode());
   out->SetStringPiece(kPUBS, forward_secure_public_value);
 
-  // Set initial receive window for flow control.
-  out->SetValue(kIFCW, initial_flow_control_window_bytes);
-
   return QUIC_NO_ERROR;
 }