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

net/tools/quic/stateless_rejector.cc

Index: net/tools/quic/stateless_rejector.cc
diff --git a/net/tools/quic/stateless_rejector.cc b/net/tools/quic/stateless_rejector.cc
index 5973a9e25230b54019954d3b89fc498ea3fbb3fb..e85e0a6a82842b23fa266c6a8843b74cb2761a1d 100644
--- a/net/tools/quic/stateless_rejector.cc
+++ b/net/tools/quic/stateless_rejector.cc
@@ -35,6 +35,7 @@ StatelessRejector::StatelessRejector(
     QuicCompressedCertsCache* compressed_certs_cache,
     const QuicClock* clock,
     QuicRandom* random,
+    QuicByteCount chlo_packet_size,
     const IPEndPoint& client_address,
     const IPEndPoint& server_address)
     : state_(FAILED),
@@ -42,6 +43,7 @@ StatelessRejector::StatelessRejector(
       version_(version),
       versions_(versions),
       connection_id_(0),
+      chlo_packet_size_(chlo_packet_size),
       client_address_(client_address),
       server_address_(server_address),
       clock_(clock),
@@ -86,8 +88,9 @@ void StatelessRejector::ProcessClientHello(
       /*reject_only=*/true, connection_id_, server_address_.address(),
       client_address_, version_, versions_,
       /*use_stateless_rejects=*/true, server_designated_connection_id_, clock_,
-      random_, compressed_certs_cache_, &params, &proof_, &reply_,
-      &diversification_nonce, &error_details_);
+      random_, compressed_certs_cache_, &params, &proof_,
+      QuicCryptoStream::CryptoMessageFramingOverhead(version_),
+      chlo_packet_size_, &reply_, &diversification_nonce, &error_details_);
   if (error != QUIC_NO_ERROR) {
     error_ = error;
     return;