Land Recent QUIC Changes.

net/quic/congestion_control/fix_rate_sender.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Fix rate send side congestion control, used for testing.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_
 #define NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_
 
 #include "base/basictypes.h"
@@ skipping 34 matching lines @@
   virtual QuicTime::Delta TimeUntilSend(
       QuicTime now,
       QuicByteCount bytes_in_flight,
       HasRetransmittableData has_retransmittable_data) const OVERRIDE;
   virtual QuicBandwidth BandwidthEstimate() const OVERRIDE;
   virtual bool HasReliableBandwidthEstimate() const OVERRIDE;
   virtual QuicTime::Delta RetransmissionDelay() const OVERRIDE;
   virtual QuicByteCount GetCongestionWindow() const OVERRIDE;
   virtual bool InSlowStart() const OVERRIDE;
   virtual QuicByteCount GetSlowStartThreshold() const OVERRIDE;
+  virtual CongestionControlType GetCongestionControlType() const OVERRIDE;
   // End implementation of SendAlgorithmInterface.
 
  private:
   QuicByteCount CongestionWindow() const;
 
   const RttStats* rtt_stats_;
   QuicBandwidth bitrate_;
   QuicByteCount max_segment_size_;
   LeakyBucket fix_rate_leaky_bucket_;
   QuicTime::Delta latest_rtt_;
 
   DISALLOW_COPY_AND_ASSIGN(FixRateSender);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_FIX_RATE_SENDER_H_