Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

net/quic/test_tools/crypto_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ skipping 606 matching lines @@
     0x45, 0x58, 0x50, 0x59,
     // EXPY end offset
     0x08, 0x00, 0x00, 0x00,
     // Value
     '1',  '2',  '3',  '4',
     '5',  '6',  '7',  '8'
   };
   // clang-format on
   rej->SetValue(kSCFG, scfg);
   rej->SetStringPiece(kServerNonceTag, "SERVER_NONCE");
+  int64_t ttl = 2 * 24 * 60 * 60;
+  rej->SetValue(kSTTL, ttl);
   vector<QuicTag> reject_reasons;
   reject_reasons.push_back(CLIENT_NONCE_INVALID_FAILURE);
   rej->SetVector(kRREJ, reject_reasons);
 }
 
 void CryptoTestUtils::CompareClientAndServerKeys(
     QuicCryptoClientStream* client,
     QuicCryptoServerStream* server) {
   QuicFramer* client_framer =
       QuicConnectionPeer::GetFramer(client->session()->connection());
@@ skipping 326 matching lines @@
     CryptoHandshakeMessage* out) {
   // Pass a inchoate CHLO.
   crypto_config->ValidateClientHello(
       inchoate_chlo, client_addr.address(), server_ip, version, clock, proof,
       new FullChloGenerator(crypto_config, server_ip, client_addr, clock, proof,
                             compressed_certs_cache, out));
 }
 
 }  // namespace test
 }  // namespace net