Land Recent QUIC changes.

net/quic/congestion_control/tcp_cubic_sender_test.cc

 // Copyright (c) 2012 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 "net/quic/congestion_control/tcp_cubic_sender.h"
 #include "net/quic/congestion_control/tcp_receiver.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 27 matching lines @@
         receiver_(new TcpReceiver()),
         sequence_number_(1),
         acked_sequence_number_(0) {
   }
 
   void SendAvailableCongestionWindow() {
     QuicByteCount bytes_to_send = sender_->AvailableCongestionWindow();
     while (bytes_to_send > 0) {
       QuicByteCount bytes_in_packet = std::min(kMaxPacketSize, bytes_to_send);
       sender_->SentPacket(clock_.Now(), sequence_number_++, bytes_in_packet,
-                          NOT_RETRANSMISSION);
+                          NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
       bytes_to_send -= bytes_in_packet;
       if (bytes_to_send > 0) {
         EXPECT_TRUE(sender_->TimeUntilSend(clock_.Now(), NOT_RETRANSMISSION,
                         HAS_RETRANSMITTABLE_DATA, NOT_HANDSHAKE).IsZero());
       }
     }
   }
   // Normal is that TCP acks every other segment.
   void AckNPackets(int n) {
     for (int i = 0; i < n; ++i) {
@@ skipping 286 matching lines @@
     // Send our full congestion window.
     SendAvailableCongestionWindow();
     AckNPackets(2);
   }
 
   QuicByteCount expected_congestion_window =
       kMaxCongestionWindowTCP * kMaxPacketSize;
   EXPECT_EQ(expected_congestion_window, sender_->CongestionWindow());
 }
 
+TEST_F(TcpCubicSenderTest, CongestionWindowNotAffectedByAcks) {
+  QuicByteCount congestion_window = sender_->AvailableCongestionWindow();
+
+  // Send a packet with no retransmittable data, and ensure that the congestion
+  // window doesn't change.
+  QuicByteCount bytes_in_packet = std::min(kMaxPacketSize, congestion_window);
+  sender_->SentPacket(clock_.Now(), sequence_number_++, bytes_in_packet,
+                      NOT_RETRANSMISSION, NO_RETRANSMITTABLE_DATA);
+  EXPECT_EQ(congestion_window, sender_->AvailableCongestionWindow());
+
+  // Send a data packet with retransmittable data, and ensure that the
+  // congestion window has shrunk.
+  sender_->SentPacket(clock_.Now(), sequence_number_++, bytes_in_packet,
+                      NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
+  EXPECT_GT(congestion_window, sender_->AvailableCongestionWindow());
+}
+
 }  // namespace test
 }  // namespace net