Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_sent_packet_manager_test.cc

Index: net/quic/core/quic_sent_packet_manager_test.cc
diff --git a/net/quic/core/quic_sent_packet_manager_test.cc b/net/quic/core/quic_sent_packet_manager_test.cc
index 3e7c4502a68692e4bf1596d708c0d1c03e42caec..f335dab83ec6c463d65d11f4b6748cddb8dbda9c 100644
--- a/net/quic/core/quic_sent_packet_manager_test.cc
+++ b/net/quic/core/quic_sent_packet_manager_test.cc
@@ -5,7 +5,7 @@
 #include "net/quic/core/quic_sent_packet_manager.h"
 
 #include <memory>
-
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/test_tools/quic_config_peer.h"
@@ -534,8 +534,8 @@ TEST_P(QuicSentPacketManagerTest, RetransmitTwiceThenAckFirst) {
 }
 
 TEST_P(QuicSentPacketManagerTest, AckOriginalTransmission) {
-  MockLossAlgorithm* loss_algorithm = new MockLossAlgorithm();
-  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm);
+  auto loss_algorithm = base::MakeUnique<MockLossAlgorithm>();
+  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm.get());
 
   SendDataPacket(1);
   RetransmitAndSendPacket(1, 2);
@@ -1346,8 +1346,8 @@ TEST_P(QuicSentPacketManagerTest, GetTransmissionDelay) {
 }
 
 TEST_P(QuicSentPacketManagerTest, GetLossDelay) {
-  MockLossAlgorithm* loss_algorithm = new MockLossAlgorithm();
-  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm);
+  auto loss_algorithm = base::MakeUnique<MockLossAlgorithm>();
+  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm.get());
 
   EXPECT_CALL(*loss_algorithm, GetLossTimeout())
       .WillRepeatedly(Return(QuicTime::Zero()));
@@ -1570,8 +1570,8 @@ TEST_P(QuicSentPacketManagerTest, NegotiateUndoFromOptionsAtServer) {
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
     SendDataPacket(i);
   }
-  MockLossAlgorithm* loss_algorithm = new MockLossAlgorithm();
-  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm);
+  auto loss_algorithm = base::MakeUnique<MockLossAlgorithm>();
+  QuicSentPacketManagerPeer::SetLossAlgorithm(&manager_, loss_algorithm.get());
   EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _));
   EXPECT_CALL(*network_change_visitor_, OnCongestionChange());
   SendAlgorithmInterface::CongestionVector lost_packets;