commit e9dc7daca7ba90abc75c9fdffd329fea47fc4a08
author wub <wub@google.com> Wed May 22 06:08:54 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 22 06:11:10 2019 -0700
tree 957356fc167dd9a1a077fd068d52aee3bb091ae0
parent 8d8dc249054a7367a73f058c1306ab3b47b1451a

gfe-relnote: (n/a) Remove stateless reject support from quic::test::CreateClientSessionForTest(). Test only.

PiperOrigin-RevId: 249434072
Change-Id: If90bd649689c959949e2101bd15bf088d1496133

quic/core/quic_crypto_server_stream_test.cc

diff --git a/quic/core/quic_crypto_server_stream_test.cc b/quic/core/quic_crypto_server_stream_test.cc
index b6dfb5e..5105a27 100644
--- a/quic/core/quic_crypto_server_stream_test.cc
+++ b/quic/core/quic_crypto_server_stream_test.cc
@@ -113,13 +113,12 @@
 
   // Initializes a fake client, and all its associated state, for
   // testing.  May be called multiple times.
-  void InitializeFakeClient(bool supports_stateless_rejects) {
+  void InitializeFakeClient() {
     TestQuicSpdyClientSession* client_session = nullptr;
     helpers_.push_back(QuicMakeUnique<NiceMock<MockQuicConnectionHelper>>());
     alarm_factories_.push_back(QuicMakeUnique<MockAlarmFactory>());
     CreateClientSessionForTest(
-        server_id_, supports_stateless_rejects,
-        QuicTime::Delta::FromSeconds(100000), supported_versions_,
+        server_id_, QuicTime::Delta::FromSeconds(100000), supported_versions_,
         helpers_.back().get(), alarm_factories_.back().get(),
         &client_crypto_config_, &client_connection_, &client_session);
     CHECK(client_session);
@@ -214,7 +213,7 @@
 
 TEST_P(QuicCryptoServerStreamTest, ForwardSecureAfterCHLO) {
   Initialize();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   // Do a first handshake in order to prime the client config with the server's
   // information.
@@ -224,7 +223,7 @@
 
   // Now do another handshake, with the blocking SHLO connection option.
   InitializeServer();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   AdvanceHandshakeWithFakeClient();
   EXPECT_TRUE(server_stream()->encryption_established());
@@ -235,7 +234,7 @@
 
 TEST_P(QuicCryptoServerStreamTest, ZeroRTT) {
   Initialize();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   // Do a first handshake in order to prime the client config with the server's
   // information.
@@ -244,7 +243,7 @@
 
   // Now do another handshake, hopefully in 0-RTT.
   QUIC_LOG(INFO) << "Resetting for 0-RTT handshake attempt";
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
   InitializeServer();
 
   EXPECT_CALL(*client_session_, OnProofValid(_)).Times(testing::AnyNumber());
@@ -266,7 +265,7 @@
 
 TEST_P(QuicCryptoServerStreamTest, FailByPolicy) {
   Initialize();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   EXPECT_CALL(*server_session_->helper(), CanAcceptClientHello(_, _, _, _, _))
       .WillOnce(testing::Return(false));
@@ -308,7 +307,7 @@
 TEST_P(QuicCryptoServerStreamTest, SendSCUPAfterHandshakeComplete) {
   Initialize();
 
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   // Do a first handshake in order to prime the client config with the server's
   // information.
@@ -316,7 +315,7 @@
 
   // Now do another handshake, with the blocking SHLO connection option.
   InitializeServer();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
   AdvanceHandshakeWithFakeClient();
 
   // Send a SCUP message and ensure that the client was able to verify it.
@@ -343,7 +342,7 @@
 
 TEST_P(QuicCryptoServerStreamTestWithFailingProofSource, Test) {
   Initialize();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
+  InitializeFakeClient();
 
   EXPECT_CALL(*server_session_->helper(), CanAcceptClientHello(_, _, _, _, _))
       .WillOnce(testing::Return(true));