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

net/quic/test_tools/quic_connection_peer.cc

Index: net/quic/test_tools/quic_connection_peer.cc
diff --git a/net/quic/test_tools/quic_connection_peer.cc b/net/quic/test_tools/quic_connection_peer.cc
index fd2a3afe0f9c4c21af128559570e04c5ae3516d4..24118ddcf182babc44d9d19440735f314c747d6e 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -26,9 +26,7 @@ void QuicConnectionPeer::SetSendAlgorithm(
     QuicConnection* connection,
     QuicPathId path_id,
     SendAlgorithmInterface* send_algorithm) {
-  GetSentPacketManager(connection, path_id)
-      ->send_algorithm_.reset(send_algorithm);
-  GetSentPacketManager(connection, path_id)->using_inline_pacing_ = false;
+  GetSentPacketManager(connection, path_id)->SetSendAlgorithm(send_algorithm);
 }
 
 // static
@@ -36,8 +34,7 @@ void QuicConnectionPeer::SetLossAlgorithm(
     QuicConnection* connection,
     QuicPathId path_id,
     LossDetectionInterface* loss_algorithm) {
-  GetSentPacketManager(connection, path_id)
-      ->loss_algorithm_.reset(loss_algorithm);
+  GetSentPacketManager(connection, path_id)->loss_algorithm_ = loss_algorithm;
 }
 
 // static
@@ -161,6 +158,13 @@ void QuicConnectionPeer::SwapCrypters(QuicConnection* connection,
 }
 
 // static
+void QuicConnectionPeer::SetCurrentPacket(QuicConnection* connection,
+                                          base::StringPiece current_packet) {
+  connection->current_packet_data_ = current_packet.data();
+  connection->last_size_ = current_packet.size();
+}
+
+// static
 QuicConnectionHelperInterface* QuicConnectionPeer::GetHelper(
     QuicConnection* connection) {
   return connection->helper_;