commit cc7d40db3b1db51d56886518dec701424f59f6a5
author dschinazi <dschinazi@google.com> Wed Dec 02 11:28:18 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Dec 02 11:28:50 2020 -0800
tree 637c2b886043115c7119cf073900d8ff638c239c
parent de85cae0309c275b85785d1e9c090cc6e401ff2c

Clean up QuicTransportVersion use

This CL does not change any behavior, it simply replaces some uses of QuicTransportVersion with ParsedQuicVersion. This is another step towards removing access to QuicTransportVersion in favor of ParsedQuicVersion.

PiperOrigin-RevId: 345274837
Change-Id: I2edf3620e966d6ffac3a78441850dbe7570054ab

quic/core/quic_packet_creator_test.cc

diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 91dbf24..e2154c1 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -102,7 +102,7 @@
                     SimpleDataProducer* producer)
       : QuicPacketCreator(connection_id, framer, delegate),
         producer_(producer),
-        version_(framer->transport_version()) {}
+        version_(framer->version()) {}
 
   bool ConsumeDataToFillCurrentPacket(QuicStreamId id,
                                       const struct iovec* iov,
@@ -125,7 +125,7 @@
   }
 
   void StopSendingVersion() {
-    if (VersionHasIetfInvariantHeader(version_)) {
+    if (version_.HasIetfInvariantHeader()) {
       set_encryption_level(ENCRYPTION_FORWARD_SECURE);
       return;
     }
@@ -133,7 +133,7 @@
   }
 
   SimpleDataProducer* producer_;
-  QuicTransportVersion version_;
+  ParsedQuicVersion version_;
 };
 
 class QuicPacketCreatorTest : public QuicTestWithParam<TestParams> {
@@ -1166,7 +1166,7 @@
 }
 
 TEST_P(QuicPacketCreatorTest, UpdatePacketSequenceNumberLengthLeastAwaiting) {
-  if (VersionHasIetfInvariantHeader(creator_.transport_version()) &&
+  if (creator_.version().HasIetfInvariantHeader() &&
       !GetParam().version.SendsVariableLengthPacketNumberInLongHeader()) {
     EXPECT_EQ(PACKET_4BYTE_PACKET_NUMBER,
               QuicPacketCreatorPeer::GetPacketNumberLength(&creator_));
@@ -1204,7 +1204,7 @@
 
 TEST_P(QuicPacketCreatorTest, UpdatePacketSequenceNumberLengthCwnd) {
   QuicPacketCreatorPeer::SetPacketNumber(&creator_, 1);
-  if (VersionHasIetfInvariantHeader(creator_.transport_version()) &&
+  if (creator_.version().HasIetfInvariantHeader() &&
       !GetParam().version.SendsVariableLengthPacketNumberInLongHeader()) {
     EXPECT_EQ(PACKET_4BYTE_PACKET_NUMBER,
               QuicPacketCreatorPeer::GetPacketNumberLength(&creator_));
@@ -1238,7 +1238,7 @@
 
 TEST_P(QuicPacketCreatorTest, SkipNPacketNumbers) {
   QuicPacketCreatorPeer::SetPacketNumber(&creator_, 1);
-  if (VersionHasIetfInvariantHeader(creator_.transport_version()) &&
+  if (creator_.version().HasIetfInvariantHeader() &&
       !GetParam().version.SendsVariableLengthPacketNumberInLongHeader()) {
     EXPECT_EQ(PACKET_4BYTE_PACKET_NUMBER,
               QuicPacketCreatorPeer::GetPacketNumberLength(&creator_));
@@ -3230,7 +3230,7 @@
 
   for (size_t i = 1; i < 10; i++) {
     creator_.SetServerConnectionIdLength(i);
-    if (VersionHasIetfInvariantHeader(framer_.transport_version())) {
+    if (framer_.version().HasIetfInvariantHeader()) {
       EXPECT_EQ(PACKET_0BYTE_CONNECTION_ID,
                 creator_.GetDestinationConnectionIdLength());
     } else {