| Index: net/quic/congestion_control/time_loss_algorithm_test.cc
|
| diff --git a/net/quic/congestion_control/time_loss_algorithm_test.cc b/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| index 42ca030eb8fba99d91818d8a251e3984c5baba0c..34e87278720eceb0e2ff60c1c0c079bd37f903fb 100644
|
| --- a/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| +++ b/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| @@ -17,16 +17,18 @@ namespace test {
|
|
|
| class TimeLossAlgorithmTest : public ::testing::Test {
|
| protected:
|
| - TimeLossAlgorithmTest()
|
| - : unacked_packets_() {
|
| + TimeLossAlgorithmTest() : unacked_packets_() {
|
| rtt_stats_.UpdateRtt(QuicTime::Delta::FromMilliseconds(100),
|
| QuicTime::Delta::Zero(),
|
| clock_.Now());
|
| }
|
|
|
| void SendDataPacket(QuicPacketSequenceNumber sequence_number) {
|
| - SerializedPacket packet(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
|
| - NULL, 0, new RetransmittableFrames());
|
| + SerializedPacket packet(sequence_number,
|
| + PACKET_1BYTE_SEQUENCE_NUMBER,
|
| + NULL,
|
| + 0,
|
| + new RetransmittableFrames());
|
| unacked_packets_.AddPacket(packet);
|
| unacked_packets_.SetSent(sequence_number, clock_.Now(), 1000, true);
|
| }
|
| @@ -34,9 +36,8 @@ class TimeLossAlgorithmTest : public ::testing::Test {
|
| void VerifyLosses(QuicPacketSequenceNumber largest_observed,
|
| QuicPacketSequenceNumber* losses_expected,
|
| size_t num_losses) {
|
| - SequenceNumberSet lost_packets =
|
| - loss_algorithm_.DetectLostPackets(
|
| - unacked_packets_, clock_.Now(), largest_observed, rtt_stats_);
|
| + SequenceNumberSet lost_packets = loss_algorithm_.DetectLostPackets(
|
| + unacked_packets_, clock_.Now(), largest_observed, rtt_stats_);
|
| EXPECT_EQ(num_losses, lost_packets.size());
|
| for (size_t i = 0; i < num_losses; ++i) {
|
| EXPECT_TRUE(ContainsKey(lost_packets, losses_expected[i]));
|
| @@ -83,7 +84,7 @@ TEST_F(TimeLossAlgorithmTest, NoLossUntilTimeout) {
|
| unacked_packets_.NackPacket(1, 5);
|
| VerifyLosses(2, NULL, 0);
|
| clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25));
|
| - QuicPacketSequenceNumber lost[] = { 1 };
|
| + QuicPacketSequenceNumber lost[] = {1};
|
| VerifyLosses(2, lost, arraysize(lost));
|
| EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
|
| }
|
| @@ -129,7 +130,7 @@ TEST_F(TimeLossAlgorithmTest, MultipleLossesAtOnce) {
|
| EXPECT_EQ(rtt_stats_.SmoothedRtt().Multiply(0.25),
|
| loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
|
| clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25));
|
| - QuicPacketSequenceNumber lost[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
| + QuicPacketSequenceNumber lost[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
|
| VerifyLosses(10, lost, arraysize(lost));
|
| EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
|
| }
|
|
|