Landing Recent QUIC changes until 01/28/2016 18:41 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 3739f3d0eefabb7880bdb2b09b0c6872e69893be..287658f98d18c790b9bcfccaf1d9610788f9a3cb 100644
--- a/net/quic/quic_unacked_packet_map_test.cc
+++ b/net/quic/quic_unacked_packet_map_test.cc
@@ -38,13 +38,13 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
       QuicPacketNumber packet_number,
       QuicStreamId stream_id) {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
-    QuicFrames* frames = new QuicFrames();
+    SerializedPacket packet(kDefaultPathId, packet_number,
+                            PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
+                            false, false);
     QuicStreamFrame* frame = new QuicStreamFrame();
     frame->stream_id = stream_id;
-    frames->push_back(QuicFrame(frame));
-    return SerializedPacket(kDefaultPathId, packet_number,
-                            PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
-                            frames, false, false);
+    packet.retransmittable_frames.push_back(QuicFrame(frame));
+    return packet;
   }
 
   SerializedPacket CreateNonRetransmittablePacket(
@@ -52,7 +52,7 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
     return SerializedPacket(kDefaultPathId, packet_number,
                             PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
-                            nullptr, false, false);
+                            false, false);
   }
 
   void VerifyInFlightPackets(QuicPacketNumber* packets, size_t num_packets) {