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

net/quic/congestion_control/general_loss_algorithm_test.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/general_loss_algorithm.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 15 matching lines @@
  protected:
   GeneralLossAlgorithmTest() {
     rtt_stats_.UpdateRtt(QuicTime::Delta::FromMilliseconds(100),
                          QuicTime::Delta::Zero(), clock_.Now());
   }
 
   ~GeneralLossAlgorithmTest() override { STLDeleteElements(&packets_); }
 
   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);
   }
 
   void VerifyLosses(QuicPacketNumber largest_observed,
                     QuicPacketNumber* losses_expected,
                     size_t num_losses) {
     unacked_packets_.IncreaseLargestObserved(largest_observed);
     PacketNumberSet lost_packets = loss_algorithm_.DetectLostPackets(
         unacked_packets_, clock_.Now(), largest_observed, rtt_stats_);
@@ skipping 245 matching lines @@
             loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
   clock_.AdvanceTime(rtt_stats_.smoothed_rtt().Multiply(0.25));
   QuicPacketNumber lost[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
   VerifyLosses(10, lost, arraysize(lost));
   EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net