Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/congestion_control/general_loss_algorithm_test.cc

Index: net/quic/congestion_control/general_loss_algorithm_test.cc
diff --git a/net/quic/congestion_control/general_loss_algorithm_test.cc b/net/quic/congestion_control/general_loss_algorithm_test.cc
index e7ad4805cf0f14da2b49656baa06a6935e37b448..12bf9eb67d5d4d77d07b280af89f95a43d7c7c2d 100644
--- a/net/quic/congestion_control/general_loss_algorithm_test.cc
+++ b/net/quic/congestion_control/general_loss_algorithm_test.cc
@@ -33,13 +33,12 @@ class GeneralLossAlgorithmTest : public ::testing::Test {
 
   void SendDataPacket(QuicPacketNumber packet_number) {
     packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
-    QuicFrames* frames = new QuicFrames();
     QuicStreamFrame* frame = new QuicStreamFrame();
     frame->stream_id = kHeadersStreamId;
-    frames->push_back(QuicFrame(frame));
     SerializedPacket packet(kDefaultPathId, packet_number,
                             PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
-                            frames, false, false);
+                            false, false);
+    packet.retransmittable_frames.push_back(QuicFrame(frame));
     unacked_packets_.AddSentPacket(&packet, 0, NOT_RETRANSMISSION, clock_.Now(),
                                    1000, true);
   }