Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_sender.h

 // 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.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
@@ skipping 25 matching lines @@
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time,
       const SentPacketsMap& sent_packets) OVERRIDE;
 
   virtual void OnIncomingAck(QuicPacketSequenceNumber acked_sequence_number,
                              QuicByteCount acked_bytes,
                              QuicTime::Delta rtt) OVERRIDE;
 
   virtual void OnIncomingLoss(QuicTime ack_receive_time) OVERRIDE;
 
-  virtual void SentPacket(QuicTime sent_time,
-                          QuicPacketSequenceNumber sequence_number,
-                          QuicByteCount bytes,
-                          Retransmission is_retransmit) OVERRIDE;
+  virtual bool SentPacket(
+      QuicTime sent_time,
+      QuicPacketSequenceNumber sequence_number,
+      QuicByteCount bytes,
+      Retransmission is_retransmit,
+      HasRetransmittableData has_retransmittable_data) OVERRIDE;
 
   virtual void AbandoningPacket(QuicPacketSequenceNumber sequence_number,
                                 QuicByteCount abandoned_bytes) OVERRIDE;
 
   virtual QuicTime::Delta TimeUntilSend(
       QuicTime now,
       Retransmission is_retransmission,
       HasRetransmittableData has_retransmittable_data,
       IsHandshake handshake) OVERRIDE;
 
@@ skipping 31 matching lines @@
   BandwidthUsage bandwidth_usage_state_;
   QuicTime back_down_time_;  // Time when we decided to back down.
   QuicBandwidth back_down_bandwidth_;  // Bandwidth before backing down.
   QuicTime::Delta back_down_congestion_delay_;  // Delay when backing down.
 
   DISALLOW_COPY_AND_ASSIGN(InterArrivalSender);
 };
 
 }  // namespace net
 #endif  // NET_QUIC_CONGESTION_CONTROL_INTER_ARRIVAL_SENDER_H_