| Index: net/quic/congestion_control/fix_rate_test.cc
|
| diff --git a/net/quic/congestion_control/fix_rate_test.cc b/net/quic/congestion_control/fix_rate_test.cc
|
| index 1ab48b8f71435a73ee2abc6edfe75f1d5466b676..7a3f87ed6e0b77d3d6eaaceb08b7dd3606b6a494 100644
|
| --- a/net/quic/congestion_control/fix_rate_test.cc
|
| +++ b/net/quic/congestion_control/fix_rate_test.cc
|
| @@ -19,9 +19,7 @@ namespace test {
|
|
|
| class FixRateReceiverPeer : public FixRateReceiver {
|
| public:
|
| - FixRateReceiverPeer()
|
| - : FixRateReceiver() {
|
| - }
|
| + FixRateReceiverPeer() : FixRateReceiver() {}
|
| void SetBitrate(QuicBandwidth fix_rate) {
|
| FixRateReceiver::configured_rate_ = fix_rate;
|
| }
|
| @@ -57,21 +55,20 @@ TEST_F(FixRateTest, SenderAPI) {
|
| QuicCongestionFeedbackFrame feedback;
|
| feedback.type = kFixRate;
|
| feedback.fix_rate.bitrate = QuicBandwidth::FromKBytesPerSecond(300);
|
| - sender_->OnIncomingQuicCongestionFeedbackFrame(feedback, clock_.Now());
|
| + sender_->OnIncomingQuicCongestionFeedbackFrame(feedback, clock_.Now());
|
| EXPECT_EQ(300000, sender_->BandwidthEstimate().ToBytesPerSecond());
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(),
|
| - HAS_RETRANSMITTABLE_DATA).IsZero());
|
| + EXPECT_TRUE(
|
| + sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA).IsZero());
|
|
|
| - sender_->OnPacketSent(clock_.Now(), 1, kDefaultMaxPacketSize,
|
| - HAS_RETRANSMITTABLE_DATA);
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(),
|
| - HAS_RETRANSMITTABLE_DATA).IsZero());
|
| - sender_->OnPacketSent(clock_.Now(), 2, kDefaultMaxPacketSize,
|
| - HAS_RETRANSMITTABLE_DATA);
|
| - sender_->OnPacketSent(clock_.Now(), 3, 600,
|
| - HAS_RETRANSMITTABLE_DATA);
|
| + sender_->OnPacketSent(
|
| + clock_.Now(), 1, kDefaultMaxPacketSize, HAS_RETRANSMITTABLE_DATA);
|
| + EXPECT_TRUE(
|
| + sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA).IsZero());
|
| + sender_->OnPacketSent(
|
| + clock_.Now(), 2, kDefaultMaxPacketSize, HAS_RETRANSMITTABLE_DATA);
|
| + sender_->OnPacketSent(clock_.Now(), 3, 600, HAS_RETRANSMITTABLE_DATA);
|
| EXPECT_EQ(QuicTime::Delta::FromMilliseconds(10),
|
| - sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA));
|
| + sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA));
|
| clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(2));
|
| EXPECT_EQ(QuicTime::Delta::Infinite(),
|
| sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA));
|
| @@ -79,8 +76,8 @@ TEST_F(FixRateTest, SenderAPI) {
|
| sender_->OnPacketAcked(1, kDefaultMaxPacketSize);
|
| sender_->OnPacketAcked(2, kDefaultMaxPacketSize);
|
| sender_->OnPacketAcked(3, 600);
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(),
|
| - HAS_RETRANSMITTABLE_DATA).IsZero());
|
| + EXPECT_TRUE(
|
| + sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA).IsZero());
|
| }
|
|
|
| TEST_F(FixRateTest, FixRatePacing) {
|
| @@ -94,14 +91,14 @@ TEST_F(FixRateTest, FixRatePacing) {
|
| QuicTime acc_advance_time(QuicTime::Zero());
|
| QuicPacketSequenceNumber sequence_number = 0;
|
| for (int i = 0; i < num_packets; i += 2) {
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(),
|
| - HAS_RETRANSMITTABLE_DATA).IsZero());
|
| - sender_->OnPacketSent(clock_.Now(), sequence_number++, packet_size,
|
| - HAS_RETRANSMITTABLE_DATA);
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(),
|
| - HAS_RETRANSMITTABLE_DATA).IsZero());
|
| - sender_->OnPacketSent(clock_.Now(), sequence_number++, packet_size,
|
| - HAS_RETRANSMITTABLE_DATA);
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA)
|
| + .IsZero());
|
| + sender_->OnPacketSent(
|
| + clock_.Now(), sequence_number++, packet_size, HAS_RETRANSMITTABLE_DATA);
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA)
|
| + .IsZero());
|
| + sender_->OnPacketSent(
|
| + clock_.Now(), sequence_number++, packet_size, HAS_RETRANSMITTABLE_DATA);
|
| QuicTime::Delta advance_time =
|
| sender_->TimeUntilSend(clock_.Now(), HAS_RETRANSMITTABLE_DATA);
|
| clock_.AdvanceTime(advance_time);
|
| @@ -109,9 +106,9 @@ TEST_F(FixRateTest, FixRatePacing) {
|
| sender_->OnPacketAcked(sequence_number - 2, packet_size);
|
| acc_advance_time = acc_advance_time.Add(advance_time);
|
| }
|
| - EXPECT_EQ(num_packets * packet_size * 1000000 / bitrate.ToBytesPerSecond(),
|
| - static_cast<uint64>(acc_advance_time.Subtract(start_)
|
| - .ToMicroseconds()));
|
| + EXPECT_EQ(
|
| + num_packets * packet_size * 1000000 / bitrate.ToBytesPerSecond(),
|
| + static_cast<uint64>(acc_advance_time.Subtract(start_).ToMicroseconds()));
|
| }
|
|
|
| } // namespace test
|
|
|