Land Recent QUIC Changes until 2/21/2015.

net/quic/quic_unacked_packet_map.h

Index: net/quic/quic_unacked_packet_map.h
diff --git a/net/quic/quic_unacked_packet_map.h b/net/quic/quic_unacked_packet_map.h
index 77d9093990dd9180fde5a183875170ce0477ab3c..a0a92e65eb7a9bcd34642094ff8d2cb4ed1acc31 100644
--- a/net/quic/quic_unacked_packet_map.h
+++ b/net/quic/quic_unacked_packet_map.h
@@ -76,9 +76,6 @@ class NET_EXPORT_PRIVATE QuicUnackedPacketMap {
   // been acked by the peer.  If there are no unacked packets, returns 0.
   QuicPacketSequenceNumber GetLeastUnacked() const;
 
-  // Restores the in flight status for a packet that was previously sent.
-  void RestoreInFlight(QuicPacketSequenceNumber sequence_number);
-
   // Clears all previous transmissions in order to make room in the ack frame
   // for newly acked packets.
   void ClearAllPreviousRetransmissions();
@@ -146,15 +143,11 @@ class NET_EXPORT_PRIVATE QuicUnackedPacketMap {
                                      const TransmissionInfo& info) const;
 
   // Returns true if packet may be useful for congestion control purposes.
-  bool IsPacketUsefulForCongestionControl(
-      QuicPacketSequenceNumber sequence_number,
-      const TransmissionInfo& info) const;
+  bool IsPacketUsefulForCongestionControl(const TransmissionInfo& info) const;
 
   // Returns true if packet may be associated with retransmittable data
   // directly or through retransmissions.
-  bool IsPacketUsefulForRetransmittableData(
-      QuicPacketSequenceNumber sequence_number,
-      const TransmissionInfo& info) const;
+  bool IsPacketUsefulForRetransmittableData(const TransmissionInfo& info) const;
 
   // Returns true if the packet no longer has a purpose in the map.
   bool IsPacketUseless(QuicPacketSequenceNumber sequence_number,