Deprecate gfe2_reloadable_flag_quic_fix_min_crypto_frame_size. PiperOrigin-RevId: 320957243 Change-Id: I61c4a2132b942eef6a0237a435937f7f10cf7173
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index 91d42db..62aa83f 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -11275,12 +11275,7 @@ if (!connection_.version().CanSendCoalescedPackets()) { return; } - if (GetQuicReloadableFlag(quic_fix_extra_padding_bytes) || - GetQuicReloadableFlag(quic_fix_min_crypto_frame_size)) { - EXPECT_CALL(visitor_, OnHandshakePacketSent()).Times(1); - } else { - EXPECT_CALL(visitor_, OnHandshakePacketSent()).Times(0); - } + EXPECT_CALL(visitor_, OnHandshakePacketSent()).Times(1); { QuicConnection::ScopedPacketFlusher flusher(&connection_); use_tagging_decrypter(); @@ -11292,21 +11287,9 @@ SendStreamDataToPeer(2, std::string(1286, 'a'), 0, NO_FIN, nullptr); connection_.SetDefaultEncryptionLevel(ENCRYPTION_HANDSHAKE); // Try to coalesce a HANDSHAKE packet after 1-RTT packet. - if (GetQuicReloadableFlag(quic_fix_extra_padding_bytes) || - GetQuicReloadableFlag(quic_fix_min_crypto_frame_size)) { - // Verify soft max packet length gets resumed and handshake packet gets - // successfully sent. - connection_.SendCryptoDataWithString("a", 0, ENCRYPTION_HANDSHAKE); - } else { - // Problematic: creator thinks there is space to consume 1-byte, however, - // extra paddings make the serialization fail because of - // MinPlaintextPacketSize. - EXPECT_CALL(visitor_, - OnConnectionClosed(_, ConnectionCloseSource::FROM_SELF)); - EXPECT_QUIC_BUG( - connection_.SendCryptoDataWithString("a", 0, ENCRYPTION_HANDSHAKE), - "AppendPaddingFrame of 3 failed"); - } + // Verify soft max packet length gets resumed and handshake packet gets + // successfully sent. + connection_.SendCryptoDataWithString("a", 0, ENCRYPTION_HANDSHAKE); } }
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc index f509692..066763a 100644 --- a/quic/core/quic_packet_creator.cc +++ b/quic/core/quic_packet_creator.cc
@@ -444,9 +444,7 @@ size_t min_frame_size = QuicFramer::GetMinCryptoFrameSize(write_length, offset); size_t min_plaintext_bytes = min_frame_size; - if (!fix_extra_padding_bytes_ && fix_min_crypto_frame_size_ && - queued_frames_.empty()) { - QUIC_RELOADABLE_FLAG_COUNT(quic_fix_min_crypto_frame_size); + if (!fix_extra_padding_bytes_ && queued_frames_.empty()) { min_plaintext_bytes = std::max(min_frame_size, MinPlaintextPacketSize(framer_->version())); }
diff --git a/quic/core/quic_packet_creator.h b/quic/core/quic_packet_creator.h index e5a73c3..80e35be 100644 --- a/quic/core/quic_packet_creator.h +++ b/quic/core/quic_packet_creator.h
@@ -635,9 +635,6 @@ const bool avoid_leak_writer_buffer_ = GetQuicReloadableFlag(quic_avoid_leak_writer_buffer); - const bool fix_min_crypto_frame_size_ = - GetQuicReloadableFlag(quic_fix_min_crypto_frame_size); - // When true, this will override the padding generation code to disable it. // TODO(fayang): remove this when deprecating // quic_determine_serialized_packet_fate_early.