Land Recent QUIC changes.

net/quic/congestion_control/quic_congestion_manager.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.
 
 // 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.
 //
 // This is the interface from the QuicConnection into the QUIC
 // congestion control code.  It wraps the SendAlgorithmInterface and
@@ skipping 32 matching lines @@
   // Called when a congestion feedback frame is received from peer.
   virtual void OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& frame,
       QuicTime feedback_receive_time);
 
   // Called when we have sent bytes to the peer.  This informs the manager both
   // the number of bytes sent and if they were retransmitted.
   virtual void SentPacket(QuicPacketSequenceNumber sequence_number,
                           QuicTime sent_time,
                           QuicByteCount bytes,
-                          Retransmission retransmission);
+                          Retransmission retransmission,
+                          HasRetransmittableData has_retransmittable_data);
 
   // Called when a packet is timed out.
   virtual void AbandoningPacket(QuicPacketSequenceNumber sequence_number);
 
   // Calculate the time until we can send the next packet to the wire.
   // Note 1: When kUnknownWaitTime is returned, there is no need to poll
   // TimeUntilSend again until we receive an OnIncomingAckFrame event.
   // Note 2: Send algorithms may or may not use |retransmit| in their
   // calculations.
   virtual QuicTime::Delta TimeUntilSend(QuicTime now,
@@ skipping 14 matching lines @@
   // timestamp: the arrival time of the packet.
   // revived: true if the packet was lost and then recovered with help of a
   // FEC packet.
   virtual void RecordIncomingPacket(QuicByteCount bytes,
                                     QuicPacketSequenceNumber sequence_number,
                                     QuicTime timestamp,
                                     bool revived);
 
   const QuicTime::Delta DefaultRetransmissionTime();
 
+  // Returns amount of time for delayed ack timer.
+  const QuicTime::Delta DelayedAckTime();
+
   const QuicTime::Delta GetRetransmissionDelay(
       size_t unacked_packets_count,
       size_t number_retransmissions);
 
   // Returns the estimated smoothed RTT calculated by the congestion algorithm.
   const QuicTime::Delta SmoothedRtt();
 
   // Returns the estimated bandwidth calculated by the congestion algorithm.
   QuicBandwidth BandwidthEstimate();
 
@@ skipping 14 matching lines @@
   PendingPacketsMap pending_packets_;
   QuicPacketSequenceNumber largest_missing_;
   QuicTime::Delta current_rtt_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCongestionManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_QUIC_CONGESTION_MANAGER_H_