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

net/quic/test_tools/crypto_test_utils_test.cc

Index: net/quic/test_tools/crypto_test_utils_test.cc
diff --git a/net/quic/test_tools/crypto_test_utils_test.cc b/net/quic/test_tools/crypto_test_utils_test.cc
index a2524a79a2122b0563d06eeba0ffa7ae188a0f1c..52c0759e95057414ff85178fa1424749f2ed34a5 100644
--- a/net/quic/test_tools/crypto_test_utils_test.cc
+++ b/net/quic/test_tools/crypto_test_utils_test.cc
@@ -41,10 +41,11 @@ class ShloVerifier : public ValidateClientHelloResultCallback {
     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();
@@ -97,7 +98,7 @@ TEST(CryptoTestUtilsTest, TestGenerateFullCHLO) {
   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",