| Index: net/quic/quic_packet_creator_test.cc
|
| diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
|
| index 6612c7849bea7c39187da20288bdeb090d9a724a..0b1a357ae4990cd16f0088a291ad2be6d5c7ebaa 100644
|
| --- a/net/quic/quic_packet_creator_test.cc
|
| +++ b/net/quic/quic_packet_creator_test.cc
|
| @@ -151,7 +151,7 @@ INSTANTIATE_TEST_CASE_P(QuicPacketCreatorTests,
|
| ::testing::ValuesIn(GetTestParams()));
|
|
|
| TEST_P(QuicPacketCreatorTest, SerializeFrames) {
|
| - frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u, 0u))));
|
| + frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u))));
|
| frames_.push_back(QuicFrame(new QuicStreamFrame(0u, false, 0u, IOVector())));
|
| frames_.push_back(QuicFrame(new QuicStreamFrame(0u, true, 0u, IOVector())));
|
| SerializedPacket serialized = creator_.SerializeAllFrames(frames_);
|
| @@ -223,7 +223,7 @@ TEST_P(QuicPacketCreatorTest, SerializeWithFEC) {
|
| }
|
|
|
| TEST_P(QuicPacketCreatorTest, SerializeChangingSequenceNumberLength) {
|
| - frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u, 0u))));
|
| + frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u))));
|
| creator_.AddSavedFrame(frames_[0]);
|
| creator_.set_next_sequence_number_length(PACKET_4BYTE_SEQUENCE_NUMBER);
|
| SerializedPacket serialized = creator_.SerializePacket();
|
| @@ -264,9 +264,6 @@ TEST_P(QuicPacketCreatorTest, SerializeChangingSequenceNumberLength) {
|
| }
|
|
|
| TEST_P(QuicPacketCreatorTest, ChangeSequenceNumberLengthMidPacket) {
|
| - if (GetParam().version <= QUIC_VERSION_15) {
|
| - return;
|
| - }
|
| // Changing the sequence number length with queued frames in the creator
|
| // should hold the change until after any currently queued frames are
|
| // serialized.
|
| @@ -274,7 +271,7 @@ TEST_P(QuicPacketCreatorTest, ChangeSequenceNumberLengthMidPacket) {
|
| // Packet 1.
|
| // Queue a frame in the creator.
|
| EXPECT_FALSE(creator_.HasPendingFrames());
|
| - QuicFrame ack_frame = QuicFrame(new QuicAckFrame(MakeAckFrame(0u, 0u)));
|
| + QuicFrame ack_frame = QuicFrame(new QuicAckFrame(MakeAckFrame(0u)));
|
| creator_.AddSavedFrame(ack_frame);
|
|
|
| // Now change sequence number length.
|
| @@ -353,7 +350,7 @@ TEST_P(QuicPacketCreatorTest, SerializeWithFECChangingSequenceNumberLength) {
|
| // Should return false since we do not have enough packets in the FEC group to
|
| // trigger an FEC packet.
|
| ASSERT_FALSE(creator_.ShouldSendFec(/*force_close=*/false));
|
| - frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u, 0u))));
|
| + frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u))));
|
|
|
| // Generate Packet 1.
|
| creator_.AddSavedFrame(frames_[0]);
|
| @@ -871,7 +868,7 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndSerialize) {
|
| creator_.BytesFree());
|
|
|
| // Add a variety of frame types and then a padding frame.
|
| - QuicAckFrame ack_frame(MakeAckFrame(0u, 0u));
|
| + QuicAckFrame ack_frame(MakeAckFrame(0u));
|
| EXPECT_TRUE(creator_.AddSavedFrame(QuicFrame(&ack_frame)));
|
| EXPECT_TRUE(creator_.HasPendingFrames());
|
|
|
|
|