Simplify ConstructMisFramedEncryptedPacket() signature.
Both call sites have only one version, so taking a ParsedQuicVersion is a better
choice than taking a ParsedQuicVersionVector.
This is motivated by the variable |version| being unused in
ConstructMisFramedEncryptedPacket(), which causes compilation failure in Envoy,
but once I'm at it, it makes sense to make this small improvement.
gfe-relnote: n/a, test-only change.
PiperOrigin-RevId: 277916457
Change-Id: Ica41b8985510bddbe81dadf9843e0a9620ef3ffe
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index dbc5963..aeb4eee 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -992,7 +992,7 @@
QuicConnectionIdIncluded destination_connection_id_included,
QuicConnectionIdIncluded source_connection_id_included,
QuicPacketNumberLength packet_number_length,
- ParsedQuicVersionVector* versions,
+ ParsedQuicVersion version,
Perspective perspective) {
QuicPacketHeader header;
header.destination_connection_id = destination_connection_id;
@@ -1004,7 +1004,7 @@
header.reset_flag = reset_flag;
header.packet_number_length = packet_number_length;
header.packet_number = QuicPacketNumber(packet_number);
- if (QuicVersionHasLongHeaderLengths((*versions)[0].transport_version) &&
+ if (QuicVersionHasLongHeaderLengths(version.transport_version) &&
version_flag) {
header.retry_token_length_length = VARIABLE_LENGTH_INTEGER_LENGTH_1;
header.length_length = VARIABLE_LENGTH_INTEGER_LENGTH_2;
@@ -1012,10 +1012,7 @@
QuicFrame frame(QuicStreamFrame(1, false, 0, QuicStringPiece(data)));
QuicFrames frames;
frames.push_back(frame);
- ParsedQuicVersion version =
- (versions != nullptr ? *versions : AllSupportedVersions())[0];
- QuicFramer framer(versions != nullptr ? *versions : AllSupportedVersions(),
- QuicTime::Zero(), perspective,
+ QuicFramer framer({version}, QuicTime::Zero(), perspective,
kQuicDefaultConnectionIdLength);
framer.SetInitialObfuscators(destination_connection_id);
EncryptionLevel level =
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index 7a88d65..eb3d2e8 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -162,7 +162,7 @@
QuicConnectionIdIncluded destination_connection_id_included,
QuicConnectionIdIncluded source_connection_id_included,
QuicPacketNumberLength packet_number_length,
- ParsedQuicVersionVector* versions,
+ ParsedQuicVersion version,
Perspective perspective);
void CompareCharArraysWithHexError(const std::string& description,
