Land Recent QUIC Changes

net/quic/congestion_control/fix_rate_sender.h

Index: net/quic/congestion_control/fix_rate_sender.h
diff --git a/net/quic/congestion_control/fix_rate_sender.h b/net/quic/congestion_control/fix_rate_sender.h
index d47462a27cfe1b38e368238c39adac581afe163a..e81981a0dc0a859f9a626096c789e522df1ae181 100644
--- a/net/quic/congestion_control/fix_rate_sender.h
+++ b/net/quic/congestion_control/fix_rate_sender.h
@@ -19,9 +19,9 @@
 namespace net {
 
 class NET_EXPORT_PRIVATE FixRateSender : public SendAlgorithmInterface {
-
  public:
   explicit FixRateSender(const QuicClock* clock);
+  virtual ~FixRateSender();
 
   // Start implementation of SendAlgorithmInterface.
   virtual void OnIncomingQuicCongestionFeedbackFrame(
@@ -36,11 +36,14 @@ class NET_EXPORT_PRIVATE FixRateSender : public SendAlgorithmInterface {
   virtual void SentPacket(QuicTime sent_time,
                           QuicPacketSequenceNumber equence_number,
                           QuicByteCount bytes,
-                          bool is_retransmission,
-                          bool has_retransmittable_data) OVERRIDE;
+                          bool is_retransmission) OVERRIDE;
+  virtual void AbandoningPacket(QuicPacketSequenceNumber sequence_number,
+                                QuicByteCount abandoned_bytes) OVERRIDE;
   virtual QuicTime::Delta TimeUntilSend(QuicTime now,
-                                        bool is_retransmission) OVERRIDE;
+                                        bool is_retransmission,
+                                        bool has_retransmittable_data) OVERRIDE;
   virtual QuicBandwidth BandwidthEstimate() OVERRIDE;
+  virtual QuicTime::Delta SmoothedRtt() OVERRIDE;
   // End implementation of SendAlgorithmInterface.
 
  private:
@@ -50,6 +53,7 @@ class NET_EXPORT_PRIVATE FixRateSender : public SendAlgorithmInterface {
   LeakyBucket fix_rate_leaky_bucket_;
   PacedSender paced_sender_;
   QuicByteCount data_in_flight_;
+  QuicTime::Delta latest_rtt_;
 
   DISALLOW_COPY_AND_ASSIGN(FixRateSender);
 };