Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

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 ff3b29e2d0676c7fe659bffbb41614c69fbec4ce..ed407453e95a4cba619e349b4bd3324356cf66b0 100644
--- a/net/tools/quic/stateless_rejector.cc
+++ b/net/tools/quic/stateless_rejector.cc
@@ -55,7 +55,7 @@ StatelessRejector::StatelessRejector(
       random_(random),
       crypto_config_(crypto_config),
       compressed_certs_cache_(compressed_certs_cache),
-      proof_(new QuicCryptoProof),
+      signed_config_(new QuicSignedServerConfig),
       params_(new QuicCryptoNegotiatedParameters) {}
 
 StatelessRejector::~StatelessRejector() {}
@@ -70,8 +70,7 @@ void StatelessRejector::OnChlo(QuicVersion version,
 
   if (!FLAGS_enable_quic_stateless_reject_support ||
       !FLAGS_quic_use_cheap_stateless_rejects ||
-      !QuicCryptoServerStream::DoesPeerSupportStatelessRejects(message) ||
-      version <= QUIC_VERSION_32) {
+      !QuicCryptoServerStream::DoesPeerSupportStatelessRejects(message)) {
     state_ = UNSUPPORTED;
     return;
   }
@@ -90,7 +89,7 @@ void StatelessRejector::Process(std::unique_ptr<StatelessRejector> rejector,
   rejector_ptr->crypto_config_->ValidateClientHello(
       rejector_ptr->chlo_, rejector_ptr->client_address_.address(),
       rejector_ptr->server_address_.address(), rejector_ptr->version_,
-      rejector_ptr->clock_, rejector_ptr->proof_,
+      rejector_ptr->clock_, rejector_ptr->signed_config_,
       std::unique_ptr<ValidateCallback>(
           new ValidateCallback(std::move(rejector), std::move(done_cb))));
 }
@@ -131,7 +130,7 @@ 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_,
+      random_, compressed_certs_cache_, params_, signed_config_,
       QuicCryptoStream::CryptoMessageFramingOverhead(version_),
       chlo_packet_size_, std::move(cb));
 }