| Index: net/quic/quic_packet_generator_test.cc
|
| diff --git a/net/quic/quic_packet_generator_test.cc b/net/quic/quic_packet_generator_test.cc
|
| index 50b8667511e6ac50fc3c224521327f02bab771b9..4d34725bfb538ce37adb6ab8d22cfbf2b302d8ce 100644
|
| --- a/net/quic/quic_packet_generator_test.cc
|
| +++ b/net/quic/quic_packet_generator_test.cc
|
| @@ -449,7 +449,7 @@ TEST_F(QuicPacketGeneratorTest, ConsumeData_FramesPreviouslyQueued) {
|
| // than the GetMinStreamFrameSize.
|
| QuicFramer::GetMinStreamFrameSize(1, 0, false) + 3 +
|
| QuicFramer::GetMinStreamFrameSize(1, 0, true) + 1;
|
| - generator_.SetMaxPacketLength(length, /*force=*/false);
|
| + generator_.SetMaxPacketLength(length);
|
| delegate_.SetCanWriteAnything();
|
| {
|
| InSequence dummy;
|
| @@ -596,7 +596,7 @@ TEST_F(QuicPacketGeneratorTest, SetMaxPacketLength_Initial) {
|
| size_t data_len = 3 * kDefaultMaxPacketSize + 1;
|
| size_t packet_len = kDefaultMaxPacketSize + 100;
|
| ASSERT_LE(packet_len, kMaxPacketSize);
|
| - generator_.SetMaxPacketLength(packet_len, /*force=*/false);
|
| + generator_.SetMaxPacketLength(packet_len);
|
| EXPECT_EQ(packet_len, generator_.GetCurrentMaxPacketLength());
|
|
|
| EXPECT_CALL(delegate_, OnSerializedPacket(_))
|
| @@ -649,7 +649,7 @@ TEST_F(QuicPacketGeneratorTest, SetMaxPacketLength_Middle) {
|
| ASSERT_EQ(2u, packets_.size());
|
|
|
| // Increase packet size.
|
| - generator_.SetMaxPacketLength(packet_len, /*force=*/false);
|
| + generator_.SetMaxPacketLength(packet_len);
|
| EXPECT_EQ(packet_len, generator_.GetCurrentMaxPacketLength());
|
|
|
| // Send a packet after packet size change.
|
| @@ -693,7 +693,7 @@ TEST_F(QuicPacketGeneratorTest, SetMaxPacketLength_Midpacket) {
|
| ASSERT_EQ(0u, packets_.size());
|
|
|
| // Increase packet size. Ensure it's not immediately enacted.
|
| - generator_.SetMaxPacketLength(packet_len, /*force=*/false);
|
| + generator_.SetMaxPacketLength(packet_len);
|
| EXPECT_EQ(packet_len, generator_.GetMaxPacketLength());
|
| EXPECT_EQ(kDefaultMaxPacketSize, generator_.GetCurrentMaxPacketLength());
|
|
|
| @@ -750,8 +750,10 @@ TEST_F(QuicPacketGeneratorTest, SetMaxPacketLength_MidpacketFlush) {
|
| EXPECT_CALL(delegate_, OnSerializedPacket(_))
|
| .WillOnce(Invoke(this, &QuicPacketGeneratorTest::SavePacket));
|
|
|
| - // Increase packet size. Ensure it's immediately enacted.
|
| - generator_.SetMaxPacketLength(packet_len, /*force=*/true);
|
| + // Increase packet size after flushing all frames.
|
| + // Ensure it's immediately enacted.
|
| + generator_.FlushAllQueuedFrames();
|
| + generator_.SetMaxPacketLength(packet_len);
|
| EXPECT_EQ(packet_len, generator_.GetMaxPacketLength());
|
| EXPECT_EQ(packet_len, generator_.GetCurrentMaxPacketLength());
|
| EXPECT_FALSE(generator_.HasQueuedFrames());
|
|
|