Land Recent QUIC Changes.

net/quic/congestion_control/send_algorithm_interface.h

Index: net/quic/congestion_control/send_algorithm_interface.h
diff --git a/net/quic/congestion_control/send_algorithm_interface.h b/net/quic/congestion_control/send_algorithm_interface.h
index 35460dad99d38c9d71ffca72e507fee137839256..df63bba05cf63adfea377f0cca7c40451c4d0d0b 100644
--- a/net/quic/congestion_control/send_algorithm_interface.h
+++ b/net/quic/congestion_control/send_algorithm_interface.h
@@ -63,8 +63,7 @@ class NET_EXPORT_PRIVATE SendAlgorithmInterface {
 
   // Called for each received ACK, with sequence number from remote peer.
   virtual void OnPacketAcked(QuicPacketSequenceNumber acked_sequence_number,
-                             QuicByteCount acked_bytes,
-                             QuicTime::Delta rtt) = 0;
+                             QuicByteCount acked_bytes) = 0;
 
   // Indicates a loss event of one packet. |sequence_number| is the
   // sequence number of the lost packet.
@@ -101,6 +100,9 @@ class NET_EXPORT_PRIVATE SendAlgorithmInterface {
   // Returns 0 when it does not have an estimate.
   virtual QuicBandwidth BandwidthEstimate() const = 0;
 
+  // Updates the smoothed RTT based on a new sample.
+  virtual void UpdateRtt(QuicTime::Delta rtt_sample) = 0;
+
   // TODO(satyamshekhar): Monitor MinRtt.
   virtual QuicTime::Delta SmoothedRtt() const = 0;