Land Recent QUIC changes

net/quic/congestion_control/fix_rate_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/fix_rate_sender.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 43 matching lines @@
 void FixRateSender::OnIncomingLoss(QuicTime /*ack_receive_time*/) {
   // Ignore losses for fix rate sender.
 }
 
 void FixRateSender::SentPacket(QuicTime sent_time,
                                QuicPacketSequenceNumber /*sequence_number*/,
                                QuicByteCount bytes,
                                Retransmission is_retransmission) {
   fix_rate_leaky_bucket_.Add(sent_time, bytes);
   paced_sender_.SentPacket(sent_time, bytes);
-  if (!is_retransmission) {
+  if (is_retransmission == NOT_RETRANSMISSION) {
     data_in_flight_ += bytes;
   }
 }
 
 void FixRateSender::AbandoningPacket(
     QuicPacketSequenceNumber /*sequence_number*/,
     QuicByteCount /*abandoned_bytes*/) {
 }
 
 QuicTime::Delta FixRateSender::TimeUntilSend(
@@ skipping 25 matching lines @@
 QuicBandwidth FixRateSender::BandwidthEstimate() {
   return bitrate_;
 }
 
 QuicTime::Delta FixRateSender::SmoothedRtt() {
   // TODO(satyamshekhar): Calculate and return smoothed rtt.
   return latest_rtt_;
 }
 
 }  // namespace net