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

net/quic/core/crypto/quic_crypto_client_config_test.cc

Index: net/quic/core/crypto/quic_crypto_client_config_test.cc
diff --git a/net/quic/core/crypto/quic_crypto_client_config_test.cc b/net/quic/core/crypto/quic_crypto_client_config_test.cc
index 9555dd195d7b4c84be10ed7d79a4fc5023e57cdc..36022ef20e7ada342f1a4512193e5ae709a9e52f 100644
--- a/net/quic/core/crypto/quic_crypto_client_config_test.cc
+++ b/net/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -255,7 +255,7 @@ TEST(QuicCryptoClientConfigTest, FillClientHello) {
 }
 
 TEST(QuicCryptoClientConfigTest, ProcessServerDowngradeAttack) {
-  QuicVersionVector supported_versions = QuicSupportedVersions();
+  QuicVersionVector supported_versions = AllSupportedVersions();
   if (supported_versions.size() == 1) {
     // No downgrade attack is possible if the client only supports one version.
     return;
@@ -437,8 +437,8 @@ TEST(QuicCryptoClientConfigTest, ProcessReject) {
   QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
   EXPECT_EQ(QUIC_NO_ERROR,
             config.ProcessRejection(rej, QuicWallTime::FromUNIXSeconds(0),
-                                    QuicSupportedVersions().front(), "",
-                                    &cached, &out_params, &error));
+                                    AllSupportedVersions().front(), "", &cached,
+                                    &out_params, &error));
   EXPECT_FALSE(cached.has_server_designated_connection_id());
   EXPECT_FALSE(cached.has_server_nonce());
 }
@@ -459,8 +459,8 @@ TEST(QuicCryptoClientConfigTest, ProcessStatelessReject) {
   QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
   EXPECT_EQ(QUIC_NO_ERROR,
             config.ProcessRejection(rej, QuicWallTime::FromUNIXSeconds(0),
-                                    QuicSupportedVersions().front(), "",
-                                    &cached, &out_params, &error));
+                                    AllSupportedVersions().front(), "", &cached,
+                                    &out_params, &error));
   EXPECT_TRUE(cached.has_server_designated_connection_id());
   EXPECT_EQ(kConnectionId, cached.GetNextServerDesignatedConnectionId());
   EXPECT_EQ(server_nonce, cached.GetNextServerNonce());
@@ -479,8 +479,8 @@ TEST(QuicCryptoClientConfigTest, BadlyFormattedStatelessReject) {
   QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
   EXPECT_EQ(QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND,
             config.ProcessRejection(rej, QuicWallTime::FromUNIXSeconds(0),
-                                    QuicSupportedVersions().front(), "",
-                                    &cached, &out_params, &error));
+                                    AllSupportedVersions().front(), "", &cached,
+                                    &out_params, &error));
   EXPECT_FALSE(cached.has_server_designated_connection_id());
   EXPECT_EQ("Missing kRCID", error);
 }
@@ -491,7 +491,7 @@ TEST(QuicCryptoClientConfigTest, ServerNonceinSHLO) {
   msg.set_tag(kSHLO);
   // Choose the latest version.
   QuicVersionVector supported_versions;
-  QuicVersion version = QuicSupportedVersions().front();
+  QuicVersion version = AllSupportedVersions().front();
   supported_versions.push_back(version);
   QuicTagVector versions;
   versions.push_back(QuicVersionToQuicTag(version));