Landing Recent QUIC Changes.

net/quic/congestion_control/tcp_loss_algorithm_test.cc

 // Copyright 2014 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 <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/rtt_stats.h"
 #include "net/quic/congestion_control/tcp_loss_algorithm.h"
@@ skipping 17 matching lines @@
     rtt_stats_.UpdateRtt(QuicTime::Delta::FromMilliseconds(100),
                          QuicTime::Delta::Zero(),
                          clock_.Now());
   }
 
   ~TcpLossAlgorithmTest() override {
     STLDeleteElements(&packets_);
   }
 
   void SendDataPacket(QuicPacketSequenceNumber sequence_number) {
-    packets_.push_back(QuicPacket::NewDataPacket(
-        nullptr, kDefaultLength, false, PACKET_8BYTE_CONNECTION_ID, false,
-        PACKET_1BYTE_SEQUENCE_NUMBER));
+    packets_.push_back(new QuicPacket(nullptr, kDefaultLength, false,
+                                      PACKET_8BYTE_CONNECTION_ID, false,
+                                      PACKET_1BYTE_SEQUENCE_NUMBER));
     SerializedPacket packet(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
                             packets_.back(), 0, new RetransmittableFrames());
     unacked_packets_.AddSentPacket(packet, 0, NOT_RETRANSMISSION, clock_.Now(),
                                    1000, true);
   }
 
   void VerifyLosses(QuicPacketSequenceNumber largest_observed,
                     QuicPacketSequenceNumber* losses_expected,
                     size_t num_losses) {
     SequenceNumberSet lost_packets =
@@ skipping 22 matching lines @@
   unacked_packets_.RemoveFromInFlight(2);
   unacked_packets_.NackPacket(1, 1);
   VerifyLosses(2, nullptr, 0);
   // No loss on two acks.
   unacked_packets_.RemoveFromInFlight(3);
   unacked_packets_.NackPacket(1, 2);
   VerifyLosses(3, nullptr, 0);
   // Loss on three acks.
   unacked_packets_.RemoveFromInFlight(4);
   unacked_packets_.NackPacket(1, 3);
-  QuicPacketSequenceNumber lost[] = { 1 };
+  QuicPacketSequenceNumber lost[] = {1};
   VerifyLosses(4, lost, arraysize(lost));
   EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
 }
 
 // A stretch ack is an ack that covers more than 1 packet of previously
 // unacknowledged data.
 TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketWith1StretchAck) {
   const size_t kNumSentPackets = 10;
   // Transmit 10 packets.
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
@@ skipping 114 matching lines @@
   unacked_packets_.IncreaseLargestObserved(2);
   unacked_packets_.RemoveFromInFlight(2);
   unacked_packets_.NackPacket(1, 1);
   QuicPacketSequenceNumber lost[] = {1};
   VerifyLosses(2, lost, arraysize(lost));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net