Land Recent QUIC Changes.

net/quic/congestion_control/tcp_loss_algorithm.h

 // Copyright (c) 2014 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.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_TCP_LOSS_ALGORITHM_H_
 #define NET_QUIC_CONGESTION_CONTROL_TCP_LOSS_ALGORITHM_H_
 
 #include <algorithm>
 #include <map>
 
@@ skipping 10 matching lines @@
 class NET_EXPORT_PRIVATE TCPLossAlgorithm : public LossDetectionInterface {
  public:
   TCPLossAlgorithm();
   virtual ~TCPLossAlgorithm() {}
 
   // Uses nack counts to decide when packets are lost.
   virtual SequenceNumberSet DetectLostPackets(
       const QuicUnackedPacketMap& unacked_packets,
       const QuicTime& time,
       QuicPacketSequenceNumber largest_observed,
-      QuicTime::Delta srtt) OVERRIDE;
+      QuicTime::Delta srtt,
+      QuicTime::Delta latest_rtt) OVERRIDE;
+
+  // Returns a non-zero value when the early retransmit timer is active.
+  virtual QuicTime GetLossTimeout() const OVERRIDE;
+
+ private:
+  QuicTime loss_detection_timeout_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_TCP_LOSS_ALGORITHM_H_