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

net/quic/quic_sent_packet_manager_test.cc

Index: net/quic/quic_sent_packet_manager_test.cc
diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
index 9d3e0cd97174f8b01c3112a94bdd52eb2cc201e3..719137ce4aed55df4f2f96ff19442866e73caf01 100644
--- a/net/quic/quic_sent_packet_manager_test.cc
+++ b/net/quic/quic_sent_packet_manager_test.cc
@@ -49,7 +49,12 @@ class MockDebugDelegate : public QuicSentPacketManager::DebugDelegate {
 class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
  protected:
   QuicSentPacketManagerTest()
-      : manager_(Perspective::IS_SERVER, &clock_, &stats_, kCubic, kNack),
+      : manager_(Perspective::IS_SERVER,
+                 kDefaultPathId,
+                 &clock_,
+                 &stats_,
+                 kCubic,
+                 kNack),
         send_algorithm_(new StrictMock<MockSendAlgorithm>),
         network_change_visitor_(new StrictMock<MockNetworkChangeVisitor>) {
     // These tests only work with pacing enabled.
@@ -191,14 +196,16 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
       frames->AddFrame(
           QuicFrame(new QuicStreamFrame(kStreamId, false, 0, StringPiece())));
     }
-    return SerializedPacket(packet_number, PACKET_6BYTE_PACKET_NUMBER,
-                            packets_.back(), 0u, frames, false, false);
+    return SerializedPacket(kDefaultPathId, packet_number,
+                            PACKET_6BYTE_PACKET_NUMBER, packets_.back(), 0u,
+                            frames, false, false);
   }
 
   SerializedPacket CreateFecPacket(QuicPacketNumber packet_number) {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
-    SerializedPacket serialized(packet_number, PACKET_6BYTE_PACKET_NUMBER,
-                                packets_.back(), 0u, nullptr, false, false);
+    SerializedPacket serialized(kDefaultPathId, packet_number,
+                                PACKET_6BYTE_PACKET_NUMBER, packets_.back(), 0u,
+                                nullptr, false, false);
     serialized.is_fec_packet = true;
     return serialized;
   }