Land Recent QUIC changes

net/quic/congestion_control/tcp_cubic_sender.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 "net/quic/congestion_control/tcp_cubic_sender.h"
 
 namespace net {
 
 namespace {
 // Constants based on TCP defaults.
@@ skipping 69 matching lines @@
     congestion_window_ = 1;
   }
   DLOG(INFO) << "Incoming loss; congestion window:" << congestion_window_;
 }
 
 void TcpCubicSender::SentPacket(QuicTime /*sent_time*/,
                                 QuicPacketSequenceNumber sequence_number,
                                 QuicByteCount bytes,
                                 Retransmission is_retransmission) {
   bytes_in_flight_ += bytes;
-  if (!is_retransmission && update_end_sequence_number_) {
+  if (is_retransmission == NOT_RETRANSMISSION && update_end_sequence_number_) {
     end_sequence_number_ = sequence_number;
     if (AvailableCongestionWindow() == 0) {
       update_end_sequence_number_ = false;
       DLOG(INFO) << "Stop update end sequence number @" << sequence_number;
     }
   }
 }
 
 void TcpCubicSender::AbandoningPacket(QuicPacketSequenceNumber sequence_number,
                                       QuicByteCount abandoned_bytes) {
   bytes_in_flight_ -= abandoned_bytes;
 }
 
 QuicTime::Delta TcpCubicSender::TimeUntilSend(
     QuicTime now,
     Retransmission is_retransmission,
     HasRetransmittableData has_retransmittable_data) {
-  if (is_retransmission || !has_retransmittable_data) {
+  if (is_retransmission == IS_RETRANSMISSION ||
+      has_retransmittable_data == NO_RETRANSMITTABLE_DATA) {
     // For TCP we can always send a retransmission and/or an ACK immediately.
     return QuicTime::Delta::Zero();
   }
   if (AvailableCongestionWindow() == 0) {
     return QuicTime::Delta::Infinite();
   }
   return QuicTime::Delta::Zero();
 }
 
 QuicByteCount TcpCubicSender::AvailableCongestionWindow() {
@@ skipping 107 matching lines @@
       hybrid_slow_start_.Reset(end_sequence_number_);
     }
     hybrid_slow_start_.Update(rtt, delay_min_);
     if (hybrid_slow_start_.Exit()) {
       slowstart_threshold_ = congestion_window_;
     }
   }
 }
 
 }  // namespace net