| 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 535d691ab95f532f40cb346ef21756a1ca24455b..29a080ecd716b649055bcc6050dd6919c33d16bb 100644
|
| --- a/net/quic/quic_packet_creator_test.cc
|
| +++ b/net/quic/quic_packet_creator_test.cc
|
| @@ -182,8 +182,7 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
|
| size_t GetPacketHeaderOverhead() {
|
| return GetPacketHeaderSize(
|
| creator_.connection_id_length(), kIncludeVersion, !kIncludePathId,
|
| - QuicPacketCreatorPeer::NextPacketNumberLength(&creator_),
|
| - NOT_IN_FEC_GROUP);
|
| + QuicPacketCreatorPeer::NextPacketNumberLength(&creator_));
|
| }
|
|
|
| // Returns the number of bytes of overhead that will be added to a packet
|
| @@ -197,7 +196,7 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
|
| // frame, assuming it is the last frame in the packet
|
| size_t GetStreamFrameOverhead() {
|
| return QuicFramer::GetMinStreamFrameSize(kClientDataStreamId1, kOffset,
|
| - true, NOT_IN_FEC_GROUP);
|
| + true);
|
| }
|
|
|
| QuicIOVector MakeIOVector(StringPiece s) {
|
| @@ -818,7 +817,7 @@ TEST_P(QuicPacketCreatorTest, ConsumeDataLargerThanOneStreamFrame) {
|
| QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
|
| QuicPacketCreatorPeer::SendPathIdInPacket(&creator_),
|
| creator_.connection_id_length(), PACKET_1BYTE_PACKET_NUMBER,
|
| - NOT_IN_FEC_GROUP, &payload_length));
|
| + &payload_length));
|
| QuicFrame frame;
|
| const string too_long_payload(payload_length * 2, 'a');
|
| QuicIOVector io_vector(MakeIOVector(too_long_payload));
|
| @@ -846,7 +845,7 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndFlush) {
|
| creator_.connection_id_length(),
|
| QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
|
| QuicPacketCreatorPeer::SendPathIdInPacket(&creator_),
|
| - PACKET_1BYTE_PACKET_NUMBER, NOT_IN_FEC_GROUP),
|
| + PACKET_1BYTE_PACKET_NUMBER),
|
| creator_.BytesFree());
|
|
|
| // Add a variety of frame types and then a padding frame.
|
| @@ -887,8 +886,7 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndFlush) {
|
| GetPacketHeaderSize(
|
| creator_.connection_id_length(),
|
| QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
|
| - /*include_path_id=*/false, PACKET_1BYTE_PACKET_NUMBER,
|
| - NOT_IN_FEC_GROUP),
|
| + /*include_path_id=*/false, PACKET_1BYTE_PACKET_NUMBER),
|
| creator_.BytesFree());
|
| }
|
|
|
| @@ -902,7 +900,7 @@ TEST_P(QuicPacketCreatorTest, SerializeTruncatedAckFrameWithLargePacketSize) {
|
| // the number of nack ranges that can be fit in an ack frame.
|
| QuicAckFrame ack_frame = MakeAckFrameWithNackRanges(2000u, 0u);
|
| size_t frame_len = client_framer_.GetSerializedFrameLength(
|
| - QuicFrame(&ack_frame), creator_.BytesFree(), true, true, NOT_IN_FEC_GROUP,
|
| + QuicFrame(&ack_frame), creator_.BytesFree(), true, true,
|
| PACKET_1BYTE_PACKET_NUMBER);
|
| EXPECT_GT(creator_.BytesFree(), frame_len);
|
| EXPECT_GT(creator_.max_packet_length(), creator_.PacketSize());
|
| @@ -950,7 +948,7 @@ TEST_P(QuicPacketCreatorTest, SerializeTruncatedAckFrameWithSmallPacketSize) {
|
| // the packet size.
|
| QuicAckFrame ack_frame = MakeAckFrameWithNackRanges(2000u, 0u);
|
| size_t frame_len = client_framer_.GetSerializedFrameLength(
|
| - QuicFrame(&ack_frame), creator_.BytesFree(), true, true, NOT_IN_FEC_GROUP,
|
| + QuicFrame(&ack_frame), creator_.BytesFree(), true, true,
|
| PACKET_1BYTE_PACKET_NUMBER);
|
| EXPECT_EQ(creator_.BytesFree(), frame_len);
|
|
|
|
|