Rollback of internal changelist 128865569.

net/quic/core/congestion_control/pacing_sender_test.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/congestion_control/pacing_sender.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "net/quic/core/quic_protocol.h"
@@ skipping 11 matching lines @@
 const QuicByteCount kBytesInFlight = 1024;
 const int kInitialBurstPackets = 10;
 
 class PacingSenderTest : public ::testing::Test {
  protected:
   PacingSenderTest()
       : zero_time_(QuicTime::Delta::Zero()),
         infinite_time_(QuicTime::Delta::Infinite()),
         packet_number_(1),
         mock_sender_(new StrictMock<MockSendAlgorithm>()),
-        pacing_sender_(new PacingSender) {
-    pacing_sender_->SetSender(mock_sender_, true);
+        pacing_sender_(new PacingSender(mock_sender_,
+                                        QuicTime::Delta::FromMilliseconds(1),
+                                        0)) {
     // Pick arbitrary time.
     clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(9));
   }
 
   ~PacingSenderTest() override {}
 
   void InitPacingRate(QuicPacketCount burst_size, QuicBandwidth bandwidth) {
+    pacing_sender_.reset();
     mock_sender_ = new StrictMock<MockSendAlgorithm>();
-    pacing_sender_.reset(new PacingSender);
-    pacing_sender_->SetSender(mock_sender_, true);
+    pacing_sender_.reset(new PacingSender(
+        mock_sender_, QuicTime::Delta::FromMilliseconds(1), burst_size));
     EXPECT_CALL(*mock_sender_, PacingRate(_)).WillRepeatedly(Return(bandwidth));
-    if (burst_size == 0) {
-      EXPECT_CALL(*mock_sender_, OnCongestionEvent(_, _, _, _));
-      SendAlgorithmInterface::CongestionVector lost_packets;
-      lost_packets.push_back(std::make_pair(1, kMaxPacketSize));
-      SendAlgorithmInterface::CongestionVector empty;
-      pacing_sender_->OnCongestionEvent(true, 1234, empty, lost_packets);
-    } else if (burst_size != kInitialBurstPackets) {
-      LOG(FATAL) << "Unsupported burst_size specificied.";
-    }
   }
 
   void CheckPacketIsSentImmediately(HasRetransmittableData retransmittable_data,
                                     QuicByteCount bytes_in_flight,
                                     bool in_recovery) {
     // In order for the packet to be sendable, the underlying sender must
     // permit it to be sent immediately.
     for (int i = 0; i < 2; ++i) {
       EXPECT_CALL(*mock_sender_, TimeUntilSend(clock_.Now(), bytes_in_flight))
           .WillOnce(Return(zero_time_));
@@ skipping 273 matching lines @@
 
   UpdateRtt();
 
   // Ensure only one packet is sent immediately and the rest are paced.
   CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, 0, true);
   CheckPacketIsSentImmediately();
   CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
 }
 
 TEST_F(PacingSenderTest, VerifyInnerSenderCalled) {
-  // Configure pacing rate of 1 packet per 1 ms with no burst tokens.
-  InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
-                        kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
   QuicBandwidth kBandwidth = QuicBandwidth::FromBitsPerSecond(1000);
   QuicTime kTime = QuicTime::Infinite();
   QuicTime::Delta kTimeDelta = QuicTime::Delta::Infinite();
   QuicByteCount kBytes = 12345u;
 
   EXPECT_CALL(*mock_sender_, SetFromConfig(_, Perspective::IS_SERVER));
   QuicConfig config;
   pacing_sender_->SetFromConfig(config, Perspective::IS_SERVER);
 
   EXPECT_CALL(*mock_sender_, ResumeConnectionState(_, true));
@@ skipping 45 matching lines @@
   EXPECT_CALL(*mock_sender_, GetSlowStartThreshold()).WillOnce(Return(kBytes));
   EXPECT_EQ(kBytes, pacing_sender_->GetSlowStartThreshold());
 
   EXPECT_CALL(*mock_sender_, GetCongestionControlType())
       .WillOnce(Return(kReno));
   EXPECT_EQ(kReno, pacing_sender_->GetCongestionControlType());
 }
 
 }  // namespace test
 }  // namespace net