diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index 79b6470b49fb..f709e7a24984 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -129,8 +129,6 @@ FALSE_RUNTIME_GUARD(envoy_reloadable_features_always_use_v6); FALSE_RUNTIME_GUARD(envoy_reloadable_features_refresh_rtt_after_request); // TODO(danzh) false deprecate it once QUICHE has its own enable/disable flag. FALSE_RUNTIME_GUARD(envoy_reloadable_features_quic_reject_all); -// TODO(steveWang) flip this to true after this is verified in prod. -FALSE_RUNTIME_GUARD(envoy_reloadable_features_quiche_use_mem_slice_releasor_api); // TODO(suniltheta): Once the newly added http async technique is stabilized move it under // RUNTIME_GUARD so that this option becomes default enabled. Once this option proves effective // remove the feature flag and remove code path that relies on old technique to fetch credentials diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD index 13cb63c6c5ee..6c0fff13ff16 100644 --- a/test/common/quic/BUILD +++ b/test/common/quic/BUILD @@ -128,7 +128,6 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/http:stream_decoder_mock", "//test/mocks/network:network_mocks", - "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", "@com_github_google_quiche//:quic_core_http_spdy_session_lib", "@com_github_google_quiche//:quic_test_tools_qpack_qpack_test_utils_lib", @@ -150,7 +149,6 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/http:stream_decoder_mock", "//test/mocks/network:network_mocks", - "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", "@com_github_google_quiche//:quic_core_http_spdy_session_lib", "@com_github_google_quiche//:quic_test_tools_qpack_qpack_test_utils_lib", diff --git a/test/common/quic/envoy_quic_client_stream_test.cc b/test/common/quic/envoy_quic_client_stream_test.cc index 7daf1fe0db1c..b579c6962130 100644 --- a/test/common/quic/envoy_quic_client_stream_test.cc +++ b/test/common/quic/envoy_quic_client_stream_test.cc @@ -8,7 +8,6 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/http/stream_decoder.h" #include "test/mocks/network/mocks.h" -#include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" @@ -249,10 +248,6 @@ TEST_F(EnvoyQuicClientStreamTest, PostRequestAndResponse) { } TEST_F(EnvoyQuicClientStreamTest, PostRequestAndResponseWithMemSliceReleasor) { - TestScopedRuntime scoped_runtime; - scoped_runtime.mergeValues( - {{"envoy.reloadable_features.quiche_use_mem_slice_releasor_api", "true"}}); - EXPECT_EQ(absl::nullopt, quic_stream_->http1StreamEncoderOptions()); const auto result = quic_stream_->encodeHeaders(request_headers_, false); EXPECT_TRUE(result.ok()); diff --git a/test/common/quic/envoy_quic_server_stream_test.cc b/test/common/quic/envoy_quic_server_stream_test.cc index 5f976e56ba57..51f1e01045e9 100644 --- a/test/common/quic/envoy_quic_server_stream_test.cc +++ b/test/common/quic/envoy_quic_server_stream_test.cc @@ -15,7 +15,6 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/http/stream_decoder.h" #include "test/mocks/network/mocks.h" -#include "test/test_common/test_runtime.h" #include "test/test_common/test_time.h" #include "test/test_common/utility.h" @@ -287,10 +286,6 @@ TEST_F(EnvoyQuicServerStreamTest, PostRequestAndResponse) { } TEST_F(EnvoyQuicServerStreamTest, PostRequestAndResponseWithMemSliceReleasor) { - TestScopedRuntime scoped_runtime; - scoped_runtime.mergeValues( - {{"envoy.reloadable_features.quiche_use_mem_slice_releasor_api", "true"}}); - EXPECT_EQ(absl::nullopt, quic_stream_->http1StreamEncoderOptions()); receiveRequest(request_body_, true, request_body_.size() * 2); quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false);