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

net/quic/test_tools/crypto_test_utils_test.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 "net/quic/core/crypto/crypto_server_config_protobuf.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/test/gtest_util.h"
@@ skipping 23 matching lines @@
   // Verify that the output message is a SHLO.
   void RunImpl(const CryptoHandshakeMessage& chlo,
                const ValidateClientHelloResultCallback::Result& result,
                std::unique_ptr<ProofSource::Details> /* details */) override {
     QuicCryptoNegotiatedParameters params;
     string error_details;
     DiversificationNonce diversification_nonce;
     CryptoHandshakeMessage out;
     crypto_config_->ProcessClientHello(
         result, /*reject_only=*/false, /*connection_id=*/1, server_ip_,
-        client_addr_, QuicSupportedVersions().front(), QuicSupportedVersions(),
+        client_addr_, AllSupportedVersions().front(), AllSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, &params,
-        proof_, &out, &diversification_nonce, &error_details);
+        proof_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize, &out,
+        &diversification_nonce, &error_details);
     // Verify output is a SHLO.
     EXPECT_EQ(out.tag(), kSHLO) << "Fail to pass validation. Get "
                                 << out.DebugString();
   }
 
  protected:
   QuicCryptoServerConfig* crypto_config_;
   IPAddress server_ip_;
   IPEndPoint client_addr_;
   const QuicClock* clock_;
@@ skipping 32 matching lines @@
       StringPiece(reinterpret_cast<const char*>(orbit.data()),
                   sizeof(orbit.size())),
       &nonce);
   string nonce_hex = "#" + QuicUtils::HexEncode(nonce);
 
   char public_value[32];
   memset(public_value, 42, sizeof(public_value));
   string pub_hex =
       "#" + QuicUtils::HexEncode(public_value, sizeof(public_value));
 
-  QuicVersion version(QuicSupportedVersions().front());
+  QuicVersion version(AllSupportedVersions().front());
   // clang-format off
   CryptoHandshakeMessage inchoate_chlo = CryptoTestUtils::Message(
     "CHLO",
     "PDMD", "X509",
     "AEAD", "AESG",
     "KEXS", "C255",
     "COPT", "SREJ",
     "PUBS", pub_hex.c_str(),
     "NONC", nonce_hex.c_str(),
     "VER\0", QuicUtils::TagToString(QuicVersionToQuicTag(version)).c_str(),
     "$padding", static_cast<int>(kClientHelloMinimumSize),
     nullptr);
   // clang-format on
 
   CryptoTestUtils::GenerateFullCHLO(inchoate_chlo, &crypto_config, server_ip,
                                     client_addr, version, &clock, &proof,
                                     &compressed_certs_cache, &full_chlo);
   // Verify that full_chlo can pass crypto_config's verification.
   crypto_config.ValidateClientHello(
       full_chlo, client_addr.address(), server_ip, version, &clock, &proof,
       new ShloVerifier(&crypto_config, server_ip, client_addr, &clock, &proof,
                        &compressed_certs_cache));
 }
 
 }  // namespace test
 }  // namespace net