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

net/tools/quic/chlo_extractor_test.cc

 // Copyright (c) 2016 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/tools/quic/chlo_extractor.h"
 
 #include "net/quic/core/quic_framer.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
@@ skipping 30 matching lines @@
   string chlo_;
 };
 
 class ChloExtractorTest : public ::testing::Test {
  public:
   ChloExtractorTest() {
     header_.public_header.connection_id = 42;
     header_.public_header.connection_id_length = PACKET_8BYTE_CONNECTION_ID;
     header_.public_header.version_flag = true;
     header_.public_header.versions =
-        SupportedVersions(QuicSupportedVersions().front());
+        SupportedVersions(AllSupportedVersions().front());
     header_.public_header.reset_flag = false;
     header_.public_header.packet_number_length = PACKET_6BYTE_PACKET_NUMBER;
     header_.packet_number = 1;
     header_.entropy_flag = false;
     header_.entropy_hash = 0;
   }
 
   void MakePacket(QuicStreamFrame* stream_frame) {
     QuicFrame frame(stream_frame);
     QuicFrames frames;
@@ skipping 19 matching lines @@
   char buffer_[kMaxPacketSize];
 };
 
 TEST_F(ChloExtractorTest, FindsValidChlo) {
   CryptoHandshakeMessage client_hello;
   client_hello.set_tag(kCHLO);
 
   string client_hello_str(
       client_hello.GetSerialized().AsStringPiece().as_string());
   // Construct a CHLO with each supported version
-  for (QuicVersion version : QuicSupportedVersions()) {
+  for (QuicVersion version : AllSupportedVersions()) {
     QuicVersionVector versions(SupportedVersions(version));
     header_.public_header.versions = versions;
     MakePacket(
         new QuicStreamFrame(kCryptoStreamId, false, 0, client_hello_str));
     EXPECT_TRUE(ChloExtractor::Extract(*packet_, versions, &delegate_))
         << QuicVersionToString(version);
     EXPECT_EQ(version, delegate_.version());
     EXPECT_EQ(header_.public_header.connection_id, delegate_.connection_id());
     EXPECT_EQ(client_hello.DebugString(), delegate_.chlo())
         << QuicVersionToString(version);
   }
 }
 
 TEST_F(ChloExtractorTest, DoesNotFindValidChloOnWrongStream) {
   CryptoHandshakeMessage client_hello;
   client_hello.set_tag(kCHLO);
 
   string client_hello_str(
       client_hello.GetSerialized().AsStringPiece().as_string());
   MakePacket(
       new QuicStreamFrame(kCryptoStreamId + 1, false, 0, client_hello_str));
   EXPECT_FALSE(
-      ChloExtractor::Extract(*packet_, QuicSupportedVersions(), &delegate_));
+      ChloExtractor::Extract(*packet_, AllSupportedVersions(), &delegate_));
 }
 
 TEST_F(ChloExtractorTest, DoesNotFindValidChloOnWrongOffset) {
   CryptoHandshakeMessage client_hello;
   client_hello.set_tag(kCHLO);
 
   string client_hello_str(
       client_hello.GetSerialized().AsStringPiece().as_string());
   MakePacket(new QuicStreamFrame(kCryptoStreamId, false, 1, client_hello_str));
   EXPECT_FALSE(
-      ChloExtractor::Extract(*packet_, QuicSupportedVersions(), &delegate_));
+      ChloExtractor::Extract(*packet_, AllSupportedVersions(), &delegate_));
 }
 
 TEST_F(ChloExtractorTest, DoesNotFindInvalidChlo) {
   MakePacket(new QuicStreamFrame(kCryptoStreamId, false, 0, "foo"));
   EXPECT_FALSE(
-      ChloExtractor::Extract(*packet_, QuicSupportedVersions(), &delegate_));
+      ChloExtractor::Extract(*packet_, AllSupportedVersions(), &delegate_));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net