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 d3d48c7e3dace2b7c1fde920ecb83b51d3803379..5a3c0f424bd00256ba40af50fceaf751502cd634 100644
--- a/net/quic/congestion_control/fix_rate_sender.h
+++ b/net/quic/congestion_control/fix_rate_sender.h
@@ -21,7 +21,7 @@ namespace net {
 class NET_EXPORT_PRIVATE FixRateSender : public SendAlgorithmInterface {
  public:
   explicit FixRateSender(const QuicClock* clock);
-  virtual ~FixRateSender();
+  virtual ~FixRateSender() OVERRIDE;
 
   // Start implementation of SendAlgorithmInterface.
   virtual void SetFromConfig(const QuicConfig& config, bool is_server) OVERRIDE;
@@ -41,7 +41,7 @@ class NET_EXPORT_PRIVATE FixRateSender : public SendAlgorithmInterface {
       QuicByteCount bytes,
       TransmissionType transmission_type,
       HasRetransmittableData has_retransmittable_data) OVERRIDE;
-  virtual void OnRetransmissionTimeout() OVERRIDE;
+  virtual void OnRetransmissionTimeout(bool packets_retransmitted) OVERRIDE;
   virtual void OnPacketAbandoned(QuicPacketSequenceNumber sequence_number,
                                  QuicByteCount abandoned_bytes) OVERRIDE;
   virtual QuicTime::Delta TimeUntilSend(