commit edf9ad59425c97fb7dbcd26816b6da62981c8a80
author fayang <fayang@google.com> Thu Mar 05 13:49:18 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 05 13:49:51 2020 -0800
tree 90875a132f4d60a981342295803b5f62c14223c5
parent 0c161c6cb87f2d22cad8d7cc7747d6bcae0a4dd7

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_use_get_handshake_state.

PiperOrigin-RevId: 299184329
Change-Id: Iacba5eccae91762154dca5adecf33e049bd0c648

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 8fc858c..4a92ab7 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4093,11 +4093,7 @@
 }
 
 bool QuicConnection::IsHandshakeComplete() const {
-  if (GetQuicReloadableFlag(quic_use_get_handshake_state)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_use_get_handshake_state);
-    return visitor_->GetHandshakeState() >= HANDSHAKE_COMPLETE;
-  }
-  return sent_packet_manager_.handshake_finished();
+  return visitor_->GetHandshakeState() >= HANDSHAKE_COMPLETE;
 }
 
 bool QuicConnection::IsHandshakeConfirmed() const {

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 9753ba1..ce0829f 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -8177,10 +8177,8 @@
   EXPECT_CALL(*send_algorithm_, OnApplicationLimited(_)).Times(0);
   ASSERT_EQ(0u, connection_.GetStats().packets_sent);
   connection_.set_fill_up_link_during_probing(true);
-  if (GetQuicReloadableFlag(quic_use_get_handshake_state)) {
-    EXPECT_CALL(visitor_, GetHandshakeState())
-        .WillRepeatedly(Return(HANDSHAKE_COMPLETE));
-  }
+  EXPECT_CALL(visitor_, GetHandshakeState())
+      .WillRepeatedly(Return(HANDSHAKE_COMPLETE));
   connection_.OnHandshakeComplete();
   connection_.SendStreamData3();
 

quic/core/quic_sent_packet_manager.h

diff --git a/quic/core/quic_sent_packet_manager.h b/quic/core/quic_sent_packet_manager.h
index 951cdb0..718c06d 100644
--- a/quic/core/quic_sent_packet_manager.h
+++ b/quic/core/quic_sent_packet_manager.h
@@ -345,10 +345,6 @@
     return largest_packet_peer_knows_is_acked_;
   }
 
-  // TODO(fayang): Stop exposing this when deprecating
-  // quic_use_get_handshake_state.
-  bool handshake_finished() const { return handshake_finished_; }
-
   size_t pending_timer_transmission_count() const {
     return pending_timer_transmission_count_;
   }