| Index: net/quic/congestion_control/tcp_cubic_bytes_sender_test.cc
|
| diff --git a/net/quic/congestion_control/tcp_cubic_bytes_sender_test.cc b/net/quic/congestion_control/tcp_cubic_bytes_sender_test.cc
|
| index 7b8357795f60474def010d1896c368fc292876ca..76566a137ca8743cf720a3e9de484b6606e987d2 100644
|
| --- a/net/quic/congestion_control/tcp_cubic_bytes_sender_test.cc
|
| +++ b/net/quic/congestion_control/tcp_cubic_bytes_sender_test.cc
|
| @@ -127,11 +127,11 @@ TEST_F(TcpCubicBytesSenderTest, SimpleSender) {
|
| // At startup make sure we are at the default.
|
| EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
|
| // At startup make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
| // Make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
| // And that window is un-affected.
|
| EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
|
|
|
| @@ -146,11 +146,11 @@ TEST_F(TcpCubicBytesSenderTest, ApplicationLimitedSlowStart) {
|
| // Send exactly 10 packets and ensure the CWND ends at 14 packets.
|
| const int kNumberOfAcks = 5;
|
| // At startup make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
| // Make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
|
|
| SendAvailableSendWindow();
|
| for (int i = 0; i < kNumberOfAcks; ++i) {
|
| @@ -165,13 +165,13 @@ TEST_F(TcpCubicBytesSenderTest, ApplicationLimitedSlowStart) {
|
| TEST_F(TcpCubicBytesSenderTest, ExponentialSlowStart) {
|
| const int kNumberOfAcks = 20;
|
| // At startup make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
| EXPECT_FALSE(sender_->HasReliableBandwidthEstimate());
|
| EXPECT_EQ(QuicBandwidth::Zero(), sender_->BandwidthEstimate());
|
| // Make sure we can send.
|
| - EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0, HAS_RETRANSMITTABLE_DATA)
|
| - .IsZero());
|
| + EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), 0,
|
| + HAS_RETRANSMITTABLE_DATA).IsZero());
|
|
|
| for (int i = 0; i < kNumberOfAcks; ++i) {
|
| // Send our full send window.
|
| @@ -480,8 +480,7 @@ TEST_F(TcpCubicBytesSenderTest, ConfigureMaxInitialWindow) {
|
| QuicTagVector options;
|
| options.push_back(kIW10);
|
| QuicConfigPeer::SetReceivedConnectionOptions(&config, options);
|
| - sender_->SetFromConfig(config,
|
| - /* is_server= */ Perspective::IS_SERVER,
|
| + sender_->SetFromConfig(config, Perspective::IS_SERVER,
|
| /* using_pacing= */ false);
|
| EXPECT_EQ(10u * kDefaultTCPMSS, sender_->GetCongestionWindow());
|
| }
|
| @@ -490,8 +489,7 @@ TEST_F(TcpCubicBytesSenderTest, DisableAckTrainDetectionWithPacing) {
|
| EXPECT_TRUE(sender_->hybrid_slow_start().ack_train_detection());
|
|
|
| QuicConfig config;
|
| - sender_->SetFromConfig(config,
|
| - /* is_server= */ Perspective::IS_SERVER,
|
| + sender_->SetFromConfig(config, Perspective::IS_SERVER,
|
| /* using_pacing= */ true);
|
| EXPECT_FALSE(sender_->hybrid_slow_start().ack_train_detection());
|
| }
|
|
|