Enable dynamic table in QuicTestClient and QuicTestServer. gfe-relnote: n/a, test-only change PiperOrigin-RevId: 309141996 Change-Id: I0f8f50e0ed590db67a2ee00afa4d450095e71f8b
diff --git a/quic/test_tools/quic_test_client.cc b/quic/test_tools/quic_test_client.cc index c274470..2207d17 100644 --- a/quic/test_tools/quic_test_client.cc +++ b/quic/test_tools/quic_test_client.cc
@@ -357,10 +357,6 @@ num_requests_ = 0; num_responses_ = 0; ClearPerConnectionState(); - // TODO(b/142715651): Figure out how to use QPACK in tests. - // Do not use the QPACK dynamic table in tests to avoid flakiness due to the - // uncertain order of receiving the SETTINGS frame and sending headers. - client_->disable_qpack_dynamic_table(); // As chrome will generally do this, we want it to be the default when it's // not overridden. if (!client_->config()->HasSetBytesForConnectionIdToSend()) {
diff --git a/quic/test_tools/quic_test_server.cc b/quic/test_tools/quic_test_server.cc index d85fe1f..11be664 100644 --- a/quic/test_tools/quic_test_server.cc +++ b/quic/test_tools/quic_test_server.cc
@@ -119,11 +119,6 @@ config(), connection, this, session_helper(), crypto_config(), compressed_certs_cache(), server_backend()); } - // TODO(b/142715651): Figure out how to use QPACK in tests. - // Do not use the QPACK dynamic table in tests to avoid flakiness due to the - // uncertain order of receiving the SETTINGS frame and sending headers. - session->set_qpack_maximum_dynamic_table_capacity(0); - session->set_qpack_maximum_blocked_streams(0); session->Initialize(); return session; }
diff --git a/quic/tools/quic_spdy_client_base.cc b/quic/tools/quic_spdy_client_base.cc index a944d60..1bb01ef 100644 --- a/quic/tools/quic_spdy_client_base.cc +++ b/quic/tools/quic_spdy_client_base.cc
@@ -50,8 +50,7 @@ std::move(session_cache)), store_response_(false), latest_response_code_(-1), - max_allowed_push_id_(0), - disable_qpack_dynamic_table_(false) {} + max_allowed_push_id_(0) {} QuicSpdyClientBase::~QuicSpdyClientBase() { // We own the push promise index. We need to explicitly kill @@ -64,10 +63,6 @@ } void QuicSpdyClientBase::InitializeSession() { - if (disable_qpack_dynamic_table_) { - client_session()->set_qpack_maximum_dynamic_table_capacity(0); - client_session()->set_qpack_maximum_blocked_streams(0); - } client_session()->Initialize(); client_session()->CryptoConnect(); if (max_allowed_push_id_ > 0 &&
diff --git a/quic/tools/quic_spdy_client_base.h b/quic/tools/quic_spdy_client_base.h index 2517289..a6d4f86 100644 --- a/quic/tools/quic_spdy_client_base.h +++ b/quic/tools/quic_spdy_client_base.h
@@ -142,10 +142,6 @@ // TODO(b/151641466): Rename this method. void SetMaxAllowedPushId(PushId max) { max_allowed_push_id_ = max; } - // Disables the use of the QPACK dynamic table and of blocked streams. - // Must be called before InitializeSession(). - void disable_qpack_dynamic_table() { disable_qpack_dynamic_table_ = true; } - bool EarlyDataAccepted() override; bool ReceivedInchoateReject() override; @@ -225,8 +221,6 @@ // The max promise id to set on the client session when created. PushId max_allowed_push_id_; - - bool disable_qpack_dynamic_table_; }; } // namespace quic