Land Recent QUIC Changes.

net/quic/congestion_control/pacing_sender.cc

Index: net/quic/congestion_control/pacing_sender.cc
diff --git a/net/quic/congestion_control/pacing_sender.cc b/net/quic/congestion_control/pacing_sender.cc
index cbd2d1296f279f1a8db4356b4dcdd02170dbcbf8..8d346ab3777695f4dbb4bcbd009ba7bf3da9ee8f 100644
--- a/net/quic/congestion_control/pacing_sender.cc
+++ b/net/quic/congestion_control/pacing_sender.cc
@@ -36,9 +36,8 @@ void PacingSender::OnIncomingQuicCongestionFeedbackFrame(
 
 void PacingSender::OnPacketAcked(
     QuicPacketSequenceNumber acked_sequence_number,
-    QuicByteCount acked_bytes,
-    QuicTime::Delta rtt) {
-  sender_->OnPacketAcked(acked_sequence_number, acked_bytes, rtt);
+    QuicByteCount acked_bytes) {
+  sender_->OnPacketAcked(acked_sequence_number, acked_bytes);
 }
 
 void PacingSender::OnPacketLost(QuicPacketSequenceNumber sequence_number,
@@ -123,6 +122,10 @@ QuicBandwidth PacingSender::BandwidthEstimate() const {
   return sender_->BandwidthEstimate();
 }
 
+void PacingSender::UpdateRtt(QuicTime::Delta rtt_sample) {
+  sender_->UpdateRtt(rtt_sample);
+}
+
 QuicTime::Delta PacingSender::SmoothedRtt() const {
   return sender_->SmoothedRtt();
 }