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

net/quic/quic_unacked_packet_map_test.cc

Index: net/quic/quic_unacked_packet_map_test.cc
diff --git a/net/quic/quic_unacked_packet_map_test.cc b/net/quic/quic_unacked_packet_map_test.cc
index 09596dbe0f05c721c2bab21255636bab465a472b..97c94be5aedb659a2c0dc84e9fe7031372efc5b3 100644
--- a/net/quic/quic_unacked_packet_map_test.cc
+++ b/net/quic/quic_unacked_packet_map_test.cc
@@ -31,9 +31,9 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
 
   SerializedPacket CreateRetransmittablePacket(QuicPacketNumber packet_number) {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
-    return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER,
-                            packets_.back(), 0, new RetransmittableFrames(),
-                            false, false);
+    return SerializedPacket(kDefaultPathId, packet_number,
+                            PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
+                            new RetransmittableFrames(), false, false);
   }
 
   SerializedPacket CreateRetransmittablePacketForStream(
@@ -44,15 +44,17 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
     QuicStreamFrame* frame = new QuicStreamFrame();
     frame->stream_id = stream_id;
     frames->AddFrame(QuicFrame(frame));
-    return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER,
-                            packets_.back(), 0, frames, false, false);
+    return SerializedPacket(kDefaultPathId, packet_number,
+                            PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
+                            frames, false, false);
   }
 
   SerializedPacket CreateNonRetransmittablePacket(
       QuicPacketNumber packet_number) {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
-    return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER,
-                            packets_.back(), 0, nullptr, false, false);
+    return SerializedPacket(kDefaultPathId, packet_number,
+                            PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
+                            nullptr, false, false);
   }
 
   void VerifyInFlightPackets(QuicPacketNumber* packets, size_t num_packets) {