Land Recent QUIC Changes.

net/quic/congestion_control/send_algorithm_interface.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.
 //
 // The pure virtual class for send side congestion control algorithm.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_INTERFACE_H_
 #define NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_INTERFACE_H_
 
 #include <algorithm>
@@ skipping 11 matching lines @@
 namespace net {
 
 class RttStats;
 
 class NET_EXPORT_PRIVATE SendAlgorithmInterface {
  public:
   typedef std::map<QuicPacketSequenceNumber, TransmissionInfo> CongestionMap;
 
   static SendAlgorithmInterface* Create(const QuicClock* clock,
                                         const RttStats* rtt_stats,
-                                        CongestionFeedbackType type,
+                                        CongestionControlType type,
                                         QuicConnectionStats* stats);
 
   virtual ~SendAlgorithmInterface() {}
 
   virtual void SetFromConfig(const QuicConfig& config, bool is_server) = 0;
 
   // Called when we receive congestion feedback from remote peer.
   virtual void OnIncomingQuicCongestionFeedbackFrame(
       const QuicCongestionFeedbackFrame& feedback,
       QuicTime feedback_receive_time) = 0;
@@ skipping 51 matching lines @@
   virtual QuicByteCount GetCongestionWindow() const = 0;
 
   // Whether the send algorithm is currently in slow start.  When true, the
   // BandwidthEstimate is expected to be too low.
   virtual bool InSlowStart() const = 0;
 
   // Returns the size of the slow start congestion window in bytes,
   // aka ssthresh.  Some send algorithms do not define a slow start
   // threshold and will return 0.
   virtual QuicByteCount GetSlowStartThreshold() const = 0;
+
+  virtual CongestionControlType GetCongestionControlType() const = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_INTERFACE_H_