Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/quic/quic_sent_packet_manager.cc

Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index d4f0f162e596f1e886fef172b331b836001dee22..3a39adaa2a795ea4e8699f05d911a5830db65c4f 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -63,12 +63,14 @@ bool HasCryptoHandshake(const TransmissionInfo& transmission_info) {
 
 QuicSentPacketManager::QuicSentPacketManager(
     Perspective perspective,
+    QuicPathId path_id,
     const QuicClock* clock,
     QuicConnectionStats* stats,
     CongestionControlType congestion_control_type,
     LossDetectionType loss_type)
     : unacked_packets_(),
       perspective_(perspective),
+      path_id_(path_id),
       clock_(clock),
       stats_(stats),
       debug_delegate_(nullptr),
@@ -459,7 +461,7 @@ QuicSentPacketManager::NextPendingRetransmission() {
       unacked_packets_.GetTransmissionInfo(packet_number);
   DCHECK(transmission_info.retransmittable_frames);
 
-  return PendingRetransmission(packet_number, transmission_type,
+  return PendingRetransmission(path_id_, packet_number, transmission_type,
                                *transmission_info.retransmittable_frames,
                                transmission_info.encryption_level,
                                transmission_info.packet_number_length);