Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_crypto_server_stream.cc

Index: net/quic/core/quic_crypto_server_stream.cc
diff --git a/net/quic/core/quic_crypto_server_stream.cc b/net/quic/core/quic_crypto_server_stream.cc
index 37d68ade887dda8c4f8becdabf2908a7af76e2ec..10c19e2c17593936823ab6b12b5a43d79dfa6523 100644
--- a/net/quic/core/quic_crypto_server_stream.cc
+++ b/net/quic/core/quic_crypto_server_stream.cc
@@ -80,7 +80,8 @@ QuicCryptoServerStream::QuicCryptoServerStream(
       num_server_config_update_messages_sent_(0),
       use_stateless_rejects_if_peer_supported_(
           use_stateless_rejects_if_peer_supported),
-      peer_supports_stateless_rejects_(false) {
+      peer_supports_stateless_rejects_(false),
+      chlo_packet_size_(0) {
   DCHECK_EQ(Perspective::IS_SERVER, session->connection()->perspective());
 }
 
@@ -104,6 +105,7 @@ void QuicCryptoServerStream::OnHandshakeMessage(
     const CryptoHandshakeMessage& message) {
   QuicCryptoServerStreamBase::OnHandshakeMessage(message);
   ++num_handshake_messages_;
+  chlo_packet_size_ = session()->connection()->GetCurrentPacket().length();
 
   bool require_kfixd = !FLAGS_quic_deprecate_kfixd;
 
@@ -439,7 +441,8 @@ QuicErrorCode QuicCryptoServerStream::ProcessClientHello(
       use_stateless_rejects_in_crypto_config, server_designated_connection_id,
       connection->clock(), connection->random_generator(),
       compressed_certs_cache_, &crypto_negotiated_params_, &crypto_proof_,
-      reply, out_diversification_nonce, error_details);
+      QuicCryptoStream::CryptoMessageFramingOverhead(version()),
+      chlo_packet_size_, reply, out_diversification_nonce, error_details);
 }
 
 void QuicCryptoServerStream::OverrideQuicConfigDefaults(QuicConfig* config) {}