Landing Recent QUIC Changes.

net/quic/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/congestion_control/pacing_sender.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/test_tools/mock_clock.h"
@@ skipping 131 matching lines @@
       .WillRepeatedly(Return(QuicBandwidth::FromBytesAndTimeDelta(
           kMaxPacketSize, QuicTime::Delta::FromMilliseconds(2))));
 
   // Send a whole pile of packets, and verify that they are not paced.
   for (int i = 0 ; i < 1000; ++i) {
     CheckPacketIsSentImmediately();
   }
 
   // Now update the RTT and verify that packets are actually paced.
   EXPECT_CALL(*mock_sender_, OnCongestionEvent(true, kBytesInFlight, _, _));
-  SendAlgorithmInterface::CongestionMap empty_map;
+  SendAlgorithmInterface::CongestionVector empty_map;
   pacing_sender_->OnCongestionEvent(true, kBytesInFlight, empty_map, empty_map);
 
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
 
   // The first packet was a "make up", then we sent two packets "into the
   // future", so the delay should be 2.
   CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
 
@@ skipping 54 matching lines @@
       .WillRepeatedly(Return(QuicBandwidth::FromBytesAndTimeDelta(
           kMaxPacketSize, QuicTime::Delta::FromMilliseconds(2))));
 
   // Send a whole pile of packets, and verify that they are not paced.
   for (int i = 0 ; i < 1000; ++i) {
     CheckPacketIsSentImmediately();
   }
 
   // Now update the RTT and verify that packets are actually paced.
   EXPECT_CALL(*mock_sender_, OnCongestionEvent(true, kBytesInFlight, _, _));
-  SendAlgorithmInterface::CongestionMap empty_map;
+  SendAlgorithmInterface::CongestionVector empty_map;
   pacing_sender_->OnCongestionEvent(true, kBytesInFlight, empty_map, empty_map);
 
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
 
   // The first packet was a "make up", then we sent two packets "into the
   // future", so the delay should be 2200us.
   CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2200));
 
   // Wake up on time.
@@ skipping 47 matching lines @@
   EXPECT_CALL(*mock_sender_, InSlowStart()).WillRepeatedly(Return(true));
 
   // Configure bandwith of 1 packet per 2 ms, for which the pacing rate
   // will be 1 packet per 1 ms.
   EXPECT_CALL(*mock_sender_, BandwidthEstimate())
       .WillRepeatedly(Return(QuicBandwidth::FromBytesAndTimeDelta(
           kMaxPacketSize, QuicTime::Delta::FromMilliseconds(2))));
 
   // Update the RTT and verify that the first 10 packets aren't paced.
   EXPECT_CALL(*mock_sender_, OnCongestionEvent(true, kBytesInFlight, _, _));
-  SendAlgorithmInterface::CongestionMap empty_map;
+  SendAlgorithmInterface::CongestionVector empty_map;
   pacing_sender_->OnCongestionEvent(true, kBytesInFlight, empty_map, empty_map);
 
   // Send 10 packets, and verify that they are not paced.
   for (int i = 0 ; i < 10; ++i) {
     CheckPacketIsSentImmediately();
   }
 
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
@@ skipping 21 matching lines @@
 
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
   CheckPacketIsSentImmediately();
 
   CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
 }
 
 }  // namespace test
 }  // namespace net