commit c1cab06be6b47a0f96c7dff58802680b2b583b88
author zhongyi <zhongyi@google.com> Wed Jun 19 12:02:24 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 19 12:18:35 2019 -0700
tree 6ff3749ef5b679969f674ada680edd16f2471f42
parent 7ae3d606ea1799033d164b6faba2495abdbd6257

gfe-relnote: Deprecate --gfe2_reloadable_flag_quic_fix_time_of_first_packet_sent_after_receiving.

PiperOrigin-RevId: 254043116
Change-Id: I996b5ddb083660867dad9268afb2e4a120b14f80

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 534b6a3..58d84a1 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -4473,28 +4473,11 @@
   SendStreamDataToPeer(1, "foo", 0, NO_FIN, &last_packet);
   EXPECT_EQ(QuicPacketNumber(2u), last_packet);
 
-  if (GetQuicReloadableFlag(
-          quic_fix_time_of_first_packet_sent_after_receiving)) {
-    // Simulate the timeout alarm firing, the connection will be closed.
-    EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_NETWORK_IDLE_TIMEOUT, _,
-                                             ConnectionCloseSource::FROM_SELF));
-    clock_.AdvanceTime(initial_ddl - clock_.ApproximateNow());
-    connection_.GetTimeoutAlarm()->Fire();
-  } else {
-    // Simulate the timeout alarm firing, the connection will not be closed.
-    EXPECT_CALL(visitor_, OnConnectionClosed(_, _, _)).Times(0);
-    clock_.AdvanceTime(initial_ddl - clock_.ApproximateNow());
-    connection_.GetTimeoutAlarm()->Fire();
-    EXPECT_TRUE(connection_.GetTimeoutAlarm()->IsSet());
-    EXPECT_TRUE(connection_.connected());
-
-    // Advance another 20ms, and fire the alarm again. The connection will be
-    // closed.
-    EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_NETWORK_IDLE_TIMEOUT, _,
-                                             ConnectionCloseSource::FROM_SELF));
-    clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(20));
-    connection_.GetTimeoutAlarm()->Fire();
-  }
+  // Simulate the timeout alarm firing, the connection will be closed.
+  EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_NETWORK_IDLE_TIMEOUT, _,
+                                           ConnectionCloseSource::FROM_SELF));
+  clock_.AdvanceTime(initial_ddl - clock_.ApproximateNow());
+  connection_.GetTimeoutAlarm()->Fire();
 
   EXPECT_FALSE(connection_.GetTimeoutAlarm()->IsSet());
   EXPECT_FALSE(connection_.connected());