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

net/quic/test_tools/quic_sent_packet_manager_peer.cc

Index: net/quic/test_tools/quic_sent_packet_manager_peer.cc
diff --git a/net/quic/test_tools/quic_sent_packet_manager_peer.cc b/net/quic/test_tools/quic_sent_packet_manager_peer.cc
index b3ad0b57c25bf4f9e1f5abf98cdb7f57c076ae64..572f7da0a3b29cbe0c8ad0dec1658fe64bbdb63e 100644
--- a/net/quic/test_tools/quic_sent_packet_manager_peer.cc
+++ b/net/quic/test_tools/quic_sent_packet_manager_peer.cc
@@ -68,21 +68,20 @@ SendAlgorithmInterface* QuicSentPacketManagerPeer::GetSendAlgorithm(
 void QuicSentPacketManagerPeer::SetSendAlgorithm(
     QuicSentPacketManager* sent_packet_manager,
     SendAlgorithmInterface* send_algorithm) {
-  sent_packet_manager->send_algorithm_.reset(send_algorithm);
-  sent_packet_manager->using_inline_pacing_ = false;
+  sent_packet_manager->SetSendAlgorithm(send_algorithm);
 }
 
 // static
 const LossDetectionInterface* QuicSentPacketManagerPeer::GetLossAlgorithm(
     QuicSentPacketManager* sent_packet_manager) {
-  return sent_packet_manager->loss_algorithm_.get();
+  return sent_packet_manager->loss_algorithm_;
 }
 
 // static
 void QuicSentPacketManagerPeer::SetLossAlgorithm(
     QuicSentPacketManager* sent_packet_manager,
     LossDetectionInterface* loss_detector) {
-  sent_packet_manager->loss_algorithm_.reset(loss_detector);
+  sent_packet_manager->loss_algorithm_ = loss_detector;
 }
 
 // static