| Index: net/quic/congestion_control/rtt_stats_test.cc
|
| diff --git a/net/quic/congestion_control/rtt_stats_test.cc b/net/quic/congestion_control/rtt_stats_test.cc
|
| index 5f9de6789656c2ad45df69f7bb2a89cfb03a7e74..d7a4a2236e8567fd3a08880128803ab272ec735f 100644
|
| --- a/net/quic/congestion_control/rtt_stats_test.cc
|
| +++ b/net/quic/congestion_control/rtt_stats_test.cc
|
| @@ -51,15 +51,15 @@ TEST_F(RttStatsTest, RecentMinRtt) {
|
| rtt_stats_.SampleNewRecentMinRtt(4);
|
| for (int i = 0; i < 3; ++i) {
|
| rtt_stats_.UpdateRtt(QuicTime::Delta::FromMilliseconds(50),
|
| - QuicTime::Delta::Zero(),
|
| - QuicTime::Zero());
|
| + QuicTime::Delta::Zero(),
|
| + QuicTime::Zero());
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(10), rtt_stats_.min_rtt());
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(10),
|
| rtt_stats_.recent_min_rtt());
|
| }
|
| rtt_stats_.UpdateRtt(QuicTime::Delta::FromMilliseconds(50),
|
| - QuicTime::Delta::Zero(),
|
| - QuicTime::Zero());
|
| + QuicTime::Delta::Zero(),
|
| + QuicTime::Zero());
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(10), rtt_stats_.min_rtt());
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(50), rtt_stats_.recent_min_rtt());
|
| }
|
| @@ -106,8 +106,7 @@ TEST_F(RttStatsTest, WindowedRecentMinRtt) {
|
| EXPECT_EQ(rtt_sample, RttStatsPeer::GetQuarterWindowRtt(&rtt_stats_));
|
| EXPECT_EQ(rtt_sample.Subtract(QuicTime::Delta::FromMilliseconds(5)),
|
| RttStatsPeer::GetHalfWindowRtt(&rtt_stats_));
|
| - EXPECT_EQ(QuicTime::Delta::FromMilliseconds(70),
|
| - rtt_stats_.recent_min_rtt());
|
| + EXPECT_EQ(QuicTime::Delta::FromMilliseconds(70), rtt_stats_.recent_min_rtt());
|
|
|
| // A new half rtt low sets that and the quarter rtt low.
|
| rtt_sample = rtt_sample.Subtract(QuicTime::Delta::FromMilliseconds(15));
|
| @@ -115,8 +114,7 @@ TEST_F(RttStatsTest, WindowedRecentMinRtt) {
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(10), rtt_stats_.min_rtt());
|
| EXPECT_EQ(rtt_sample, RttStatsPeer::GetQuarterWindowRtt(&rtt_stats_));
|
| EXPECT_EQ(rtt_sample, RttStatsPeer::GetHalfWindowRtt(&rtt_stats_));
|
| - EXPECT_EQ(QuicTime::Delta::FromMilliseconds(70),
|
| - rtt_stats_.recent_min_rtt());
|
| + EXPECT_EQ(QuicTime::Delta::FromMilliseconds(70), rtt_stats_.recent_min_rtt());
|
|
|
| // A new full window loss sets the recent_min_rtt, but not min_rtt.
|
| rtt_sample = QuicTime::Delta::FromMilliseconds(65);
|
| @@ -136,7 +134,5 @@ TEST_F(RttStatsTest, WindowedRecentMinRtt) {
|
| EXPECT_EQ(rtt_sample, rtt_stats_.recent_min_rtt());
|
| }
|
|
|
| -
|
| -
|
| } // namespace test
|
| } // namespace net
|
|
|