Index: net/quic/core/quic_connection_test.cc |
diff --git a/net/quic/core/quic_connection_test.cc b/net/quic/core/quic_connection_test.cc |
index 2ae0f776812cb610f337bb5685b71861c700fa8e..57d41ad850420449cc21127d88d9d45361b0312c 100644 |
--- a/net/quic/core/quic_connection_test.cc |
+++ b/net/quic/core/quic_connection_test.cc |
@@ -3287,13 +3287,8 @@ TEST_P(QuicConnectionTest, TimeoutAfterSend) { |
connection_.GetTimeoutAlarm()->Fire(); |
EXPECT_TRUE(connection_.GetTimeoutAlarm()->IsSet()); |
EXPECT_TRUE(connection_.connected()); |
- if (FLAGS_quic_better_last_send_for_timeout) { |
- EXPECT_EQ(default_timeout + five_ms, |
- connection_.GetTimeoutAlarm()->deadline()); |
- } else { |
- EXPECT_EQ(default_timeout + five_ms + five_ms, |
- connection_.GetTimeoutAlarm()->deadline()); |
- } |
+ EXPECT_EQ(default_timeout + five_ms, |
+ connection_.GetTimeoutAlarm()->deadline()); |
// This time, we should time out. |
EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_NETWORK_IDLE_TIMEOUT, _, |
@@ -3307,7 +3302,6 @@ TEST_P(QuicConnectionTest, TimeoutAfterSend) { |
} |
TEST_P(QuicConnectionTest, TimeoutAfterRetransmission) { |
- FLAGS_quic_better_last_send_for_timeout = true; |
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)); |
EXPECT_TRUE(connection_.connected()); |
EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); |
@@ -3430,13 +3424,8 @@ TEST_P(QuicConnectionTest, NewTimeoutAfterSendSilentClose) { |
connection_.GetTimeoutAlarm()->Fire(); |
EXPECT_TRUE(connection_.GetTimeoutAlarm()->IsSet()); |
EXPECT_TRUE(connection_.connected()); |
- if (FLAGS_quic_better_last_send_for_timeout) { |
- EXPECT_EQ(default_timeout + five_ms, |
- connection_.GetTimeoutAlarm()->deadline()); |
- } else { |
- EXPECT_EQ(default_timeout + five_ms + five_ms, |
- connection_.GetTimeoutAlarm()->deadline()); |
- } |
+ EXPECT_EQ(default_timeout + five_ms, |
+ connection_.GetTimeoutAlarm()->deadline()); |
// This time, we should time out. |
EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_NETWORK_IDLE_TIMEOUT, _, |