commit 67395d0451e81416d4fb4b645937494076797afe
author fayang <fayang@google.com> Mon Aug 17 09:18:27 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 17 09:19:09 2020 -0700
tree a4bfe97ae90751ce9f9220fc42d23bf9dc6baecf
parent 1abb2a19d4955dedb71e3728553245627da575a1

Deprecate gfe2_reloadable_flag_quic_support_handshake_done_in_t050.

PiperOrigin-RevId: 327033803
Change-Id: I102be1f71c3c43993fec8343ff6a504290579d1f

quic/core/http/end_to_end_test.cc

diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index 6a3cc2e..4eb856e 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -200,8 +200,6 @@
     AddToCache("/bar", 200, kBarResponseBody);
     // Enable fixes for bugs found in tests and prod.
     SetQuicReloadableFlag(quic_fix_packet_number_length, true);
-
-    SetQuicReloadableFlag(quic_support_handshake_done_in_t050, true);
     SetQuicRestartFlag(quic_enable_tls_resumption_v4, true);
     SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
   }

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 715b518..cb55eb0 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -126,11 +126,9 @@
   connection_->SetSessionNotifier(this);
   connection_->SetDataProducer(this);
   connection_->SetFromConfig(config_);
-  if (perspective() == Perspective::IS_CLIENT && version().UsesTls()) {
-    if (GetQuicReloadableFlag(quic_support_handshake_done_in_t050) &&
-        !version().HasHandshakeDone()) {
-      config_.SetSupportHandshakeDone();
-    }
+  if (perspective() == Perspective::IS_CLIENT && version().UsesTls() &&
+      !version().HasHandshakeDone()) {
+    config_.SetSupportHandshakeDone();
   }
 
   // On the server side, version negotiation has been done by the dispatcher,
@@ -1605,12 +1603,8 @@
   QUIC_BUG_IF(!config_.negotiated())
       << ENDPOINT << "Handshake completes without parameter negotiation.";
   if ((connection()->version().HasHandshakeDone() ||
-       (GetQuicReloadableFlag(quic_support_handshake_done_in_t050) &&
-        config_.PeerSupportsHandshakeDone())) &&
+       config_.PeerSupportsHandshakeDone()) &&
       perspective_ == Perspective::IS_SERVER) {
-    if (!connection()->version().HasHandshakeDone()) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_support_handshake_done_in_t050);
-    }
     // Server sends HANDSHAKE_DONE to signal confirmation of the handshake
     // to the client.
     control_frame_manager_.WriteOrBufferHandshakeDone();