commit 37e40568cb4e303d963faf105927ffac6ff85792
author haoyuewang <haoyuewang@google.com> Wed Aug 02 13:17:44 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Aug 02 13:18:45 2023 -0700
tree 565f987b22ba6cc3bc61f3053400681ac2e08b59
parent 6fc4d56a3ea6aaa793e8dcd550672ac867b8fac4

QBONE gQUIC client side clean-up step 2: deprecate --qbone_client_defer_control_stream_creation

PiperOrigin-RevId: 553236906

quiche/quic/qbone/qbone_client_session.cc

diff --git a/quiche/quic/qbone/qbone_client_session.cc b/quiche/quic/qbone/qbone_client_session.cc
index cfc6001..2ca4df2 100644
--- a/quiche/quic/qbone/qbone_client_session.cc
+++ b/quiche/quic/qbone/qbone_client_session.cc
@@ -11,11 +11,6 @@
 #include "quiche/quic/qbone/qbone_constants.h"
 #include "quiche/common/platform/api/quiche_command_line_flags.h"
 
-DEFINE_QUICHE_COMMAND_LINE_FLAG(
-    bool, qbone_client_defer_control_stream_creation, true,
-    "If true, control stream in QBONE client session is created after "
-    "encryption established.");
-
 namespace quic {
 
 QboneClientSession::QboneClientSession(
@@ -58,18 +53,12 @@
   QboneSessionBase::Initialize();
   static_cast<QuicCryptoClientStreamBase*>(GetMutableCryptoStream())
       ->CryptoConnect();
-  if (!quiche::GetQuicheCommandLineFlag(
-          FLAGS_qbone_client_defer_control_stream_creation)) {
-    CreateControlStream();
-  }
 }
 
 void QboneClientSession::SetDefaultEncryptionLevel(
     quic::EncryptionLevel level) {
   QboneSessionBase::SetDefaultEncryptionLevel(level);
-  if (quiche::GetQuicheCommandLineFlag(
-          FLAGS_qbone_client_defer_control_stream_creation) &&
-      level == quic::ENCRYPTION_FORWARD_SECURE) {
+  if (level == quic::ENCRYPTION_FORWARD_SECURE) {
     CreateControlStream();
   }
 }