Land Recent QUIC Changes.

net/quic/quic_ack_notifier.h

 // Copyright 2013 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_QUIC_ACK_NOTIFIER_H_
 #define NET_QUIC_QUIC_ACK_NOTIFIER_H_
 
 #include "base/memory/ref_counted.h"
 #include "net/quic/quic_protocol.h"
 
@@ skipping 12 matching lines @@
     DelegateInterface();
     // Args:
     //  num_original_packets - Number of packets in the original transmission.
     //  num_original_bytes - Number of packets in the original transmission.
     //  num_retransmitted_packets - Number of packets that had to be
     //                              retransmitted.
     //  num_retransmitted_bytes - Number of bytes that had to be retransmitted.
     virtual void OnAckNotification(int num_original_packets,
                                    int num_original_bytes,
                                    int num_retransmitted_packets,
-                                   int num_retransmitted_bytes) = 0;
+                                   int num_retransmitted_bytes,
+                                   QuicTime::Delta delta_largest_observed) = 0;
    protected:
     friend class base::RefCounted<DelegateInterface>;
 
     // Delegates are ref counted.
     virtual ~DelegateInterface();
   };
 
   // QuicAckNotifier is expected to keep its own reference to the delegate.
   explicit QuicAckNotifier(DelegateInterface* delegate);
   virtual ~QuicAckNotifier();
 
   // Register a sequence number that this AckNotifier should be interested in.
   void AddSequenceNumber(const QuicPacketSequenceNumber& sequence_number,
                          int packet_payload_size);
 
   // Called by the QuicConnection on receipt of new ACK frame, with the sequence
   // number referenced by the ACK frame.
   // Deletes the matching sequence number from the stored set of sequence
   // numbers. If this set is now empty, call the stored delegate's
   // OnAckNotification method.
   //
   // Returns true if the provided sequence_number caused the delegate to be
   // called, false otherwise.
-  bool OnAck(QuicPacketSequenceNumber sequence_number);
+  bool OnAck(QuicPacketSequenceNumber sequence_number,
+             QuicTime::Delta delta_largest_observed);
 
   bool IsEmpty() { return sequence_numbers_.empty(); }
 
   // If a packet is retransmitted by the connection it will be sent with a
   // different sequence number. Updates our internal set of sequence_numbers to
   // track the latest number.
   void UpdateSequenceNumber(QuicPacketSequenceNumber old_sequence_number,
                             QuicPacketSequenceNumber new_sequence_number);
 
  private:
@@ skipping 20 matching lines @@
   int original_byte_count_;
   // Number of packets that had to be retransmitted.
   int retransmitted_packet_count_;
   // Number of bytes that had to be retransmitted.
   int retransmitted_byte_count_;
 };
 
 };  // namespace net
 
 #endif  // NET_QUIC_QUIC_ACK_NOTIFIER_H_