Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/inter_arrival_sender.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 23 matching lines @@
 
   void SendAvailableCongestionWindow() {
     while (sender_.TimeUntilSend(send_clock_.Now(),
         NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA, NOT_HANDSHAKE).IsZero()) {
       QuicByteCount bytes_in_packet = kMaxPacketSize;
       sent_packets_[sequence_number_] =
           new class SendAlgorithmInterface::SentPacket(
               bytes_in_packet, send_clock_.Now());
 
       sender_.SentPacket(send_clock_.Now(), sequence_number_, bytes_in_packet,
-                         NOT_RETRANSMISSION);
+                         NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
       sequence_number_++;
     }
     EXPECT_FALSE(sender_.TimeUntilSend(send_clock_.Now(),
         NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA, NOT_HANDSHAKE).IsZero());
   }
 
   void AckNPackets(int n) {
     for (int i = 0; i < n; ++i) {
       sender_.OnIncomingAck(acked_sequence_number_++, kMaxPacketSize, rtt_);
     }
@@ skipping 501 matching lines @@
     acked_sequence_number_ += 2;  // Create a loss by not acking both packets.
     SendFeedbackMessageNPackets(2, nine_ms_, nine_ms_);
 
     // Make sure our bitrate is fixed at the expected_min_bitrate.
     EXPECT_EQ(expected_min_bitrate, sender_.BandwidthEstimate());
   }
 }
 
 }  // namespace test
 }  // namespace net