Deprecate FLAGS_quic_default_immediate_forward_secure.

net/quic/quic_crypto_server_stream_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_crypto_server_stream.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
@@ skipping 207 matching lines @@
   // CompleteCryptoHandshake returns the number of client hellos sent. This
   // test should send:
   //   * One to get a source-address token and certificates.
   //   * One to complete the handshake.
   Initialize();
   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(server_stream()->encryption_established());
   EXPECT_TRUE(server_stream()->handshake_confirmed());
 }
 
-TEST_P(QuicCryptoServerStreamTest, InitialEncryptionAfterCHLO) {
-  Initialize();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
-
-  // Do a first handshake in order to prime the client config with the server's
-  // information.
-  AdvanceHandshakeWithFakeClient();
-  EXPECT_FALSE(server_stream()->encryption_established());
-  EXPECT_FALSE(server_stream()->handshake_confirmed());
-
-  // Now do another handshake, with the blocking SHLO connection option.
-  InitializeServer();
-  InitializeFakeClient(/* supports_stateless_rejects= */ false);
-  if (FLAGS_quic_default_immediate_forward_secure) {
-    client_session_->config()->SetConnectionOptionsToSend({kIPFS});
-  }
-
-  AdvanceHandshakeWithFakeClient();
-  EXPECT_TRUE(server_stream()->encryption_established());
-  EXPECT_TRUE(server_stream()->handshake_confirmed());
-  EXPECT_EQ(ENCRYPTION_INITIAL,
-            server_session_->connection()->encryption_level());
-}
-
 TEST_P(QuicCryptoServerStreamTest, ForwardSecureAfterCHLO) {
   Initialize();
   InitializeFakeClient(/* supports_stateless_rejects= */ false);
 
   // Do a first handshake in order to prime the client config with the server's
   // information.
   AdvanceHandshakeWithFakeClient();
   EXPECT_FALSE(server_stream()->encryption_established());
   EXPECT_FALSE(server_stream()->handshake_confirmed());
 
   // Now do another handshake, with the blocking SHLO connection option.
   InitializeServer();
   InitializeFakeClient(/* supports_stateless_rejects= */ false);
-  if (!FLAGS_quic_default_immediate_forward_secure) {
-    client_session_->config()->SetConnectionOptionsToSend({kIPFS});
-  }
 
   AdvanceHandshakeWithFakeClient();
   EXPECT_TRUE(server_stream()->encryption_established());
   EXPECT_TRUE(server_stream()->handshake_confirmed());
   EXPECT_EQ(ENCRYPTION_FORWARD_SECURE,
             server_session_->connection()->encryption_level());
 }
 
 TEST_P(QuicCryptoServerStreamTest, StatelessRejectAfterCHLO) {
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_stateless_reject_support,
@@ skipping 321 matching lines @@
       QUIC_NO_ERROR, "", ConnectionCloseBehavior::SILENT_CLOSE);
 
   // The outstanding nonce verification RPC now completes.
   strike_register_client_->RunPendingVerifications();
 }
 
 }  // namespace
 
 }  // namespace test
 }  // namespace net