| Index: net/tools/quic/end_to_end_test.cc
|
| diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
|
| index 21e20d6249689f0e57ea18f565f09286a7f3ee9f..a02d12badc5f0f58f2d6d0df4bedc7f8f068db96 100644
|
| --- a/net/tools/quic/end_to_end_test.cc
|
| +++ b/net/tools/quic/end_to_end_test.cc
|
| @@ -277,7 +277,6 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
|
| client_writer_(nullptr),
|
| server_writer_(nullptr),
|
| server_started_(false),
|
| - strike_register_no_startup_period_(false),
|
| chlo_multiplier_(0),
|
| stream_factory_(nullptr),
|
| support_server_push_(false) {
|
| @@ -433,8 +432,7 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
|
| auto test_server =
|
| new QuicTestServer(CryptoTestUtils::ProofSourceForTesting(),
|
| server_config_, server_supported_versions_);
|
| - server_thread_.reset(new ServerThread(test_server, server_address_,
|
| - strike_register_no_startup_period_));
|
| + server_thread_.reset(new ServerThread(test_server, server_address_));
|
| if (chlo_multiplier_ != 0) {
|
| server_thread_->server()->SetChloMultiplier(chlo_multiplier_);
|
| }
|
| @@ -571,7 +569,6 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
|
| QuicVersionVector client_supported_versions_;
|
| QuicVersionVector server_supported_versions_;
|
| QuicVersion negotiated_version_;
|
| - bool strike_register_no_startup_period_;
|
| size_t chlo_multiplier_;
|
| QuicTestServer::StreamFactory* stream_factory_;
|
| bool support_server_push_;
|
| @@ -850,9 +847,6 @@ TEST_P(EndToEndTest, LargePostNoPacketLossWithDelayAndReordering) {
|
| }
|
|
|
| TEST_P(EndToEndTest, LargePostZeroRTTFailure) {
|
| - // Have the server accept 0-RTT without waiting a startup period.
|
| - strike_register_no_startup_period_ = true;
|
| -
|
| // Send a request and then disconnect. This prepares the client to attempt
|
| // a 0-RTT handshake for the next request.
|
| ASSERT_TRUE(Initialize());
|
| @@ -914,9 +908,6 @@ TEST_P(EndToEndTest, LargePostZeroRTTFailure) {
|
| }
|
|
|
| TEST_P(EndToEndTest, SynchronousRequestZeroRTTFailure) {
|
| - // Have the server accept 0-RTT without waiting a startup period.
|
| - strike_register_no_startup_period_ = true;
|
| -
|
| // Send a request and then disconnect. This prepares the client to attempt
|
| // a 0-RTT handshake for the next request.
|
| ASSERT_TRUE(Initialize());
|
| @@ -967,9 +958,6 @@ TEST_P(EndToEndTest, SynchronousRequestZeroRTTFailure) {
|
| }
|
|
|
| TEST_P(EndToEndTest, LargePostSynchronousRequest) {
|
| - // Have the server accept 0-RTT without waiting a startup period.
|
| - strike_register_no_startup_period_ = true;
|
| -
|
| // Send a request and then disconnect. This prepares the client to attempt
|
| // a 0-RTT handshake for the next request.
|
| ASSERT_TRUE(Initialize());
|
|
|