Land Recent QUIC changes.

net/quic/congestion_control/quic_congestion_manager.h

Index: net/quic/congestion_control/quic_congestion_manager.h
diff --git a/net/quic/congestion_control/quic_congestion_manager.h b/net/quic/congestion_control/quic_congestion_manager.h
index 8bfa3c1d425a72cf6ba6b6c249e7135f4a87f2fd..465819bee13f272b56dd2abab78adff1aa1cb64a 100644
--- a/net/quic/congestion_control/quic_congestion_manager.h
+++ b/net/quic/congestion_control/quic_congestion_manager.h
@@ -50,7 +50,8 @@ class NET_EXPORT_PRIVATE QuicCongestionManager {
   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);
@@ -85,6 +86,9 @@ class NET_EXPORT_PRIVATE QuicCongestionManager {
 
   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);