Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/quic_received_packet_manager_peer.cc

Index: net/quic/test_tools/quic_received_packet_manager_peer.cc
diff --git a/net/quic/test_tools/quic_received_packet_manager_peer.cc b/net/quic/test_tools/quic_received_packet_manager_peer.cc
index c990cc3ac098b3896392838555a661b134d628b8..2a6fc7976a46bf348e3e7ec2b0f259f77dc3130e 100644
--- a/net/quic/test_tools/quic_received_packet_manager_peer.cc
+++ b/net/quic/test_tools/quic_received_packet_manager_peer.cc
@@ -11,15 +11,6 @@ namespace net {
 namespace test {
 
 // static
-void QuicReceivedPacketManagerPeer::SetCumulativeEntropyUpTo(
-    QuicReceivedPacketManager* received_packet_manager,
-    QuicPacketNumber peer_least_unacked,
-    QuicPacketEntropyHash entropy_hash) {
-  received_packet_manager->entropy_tracker_.SetCumulativeEntropyUpTo(
-      peer_least_unacked, entropy_hash);
-}
-
-// static
 bool QuicReceivedPacketManagerPeer::DontWaitForPacketsBefore(
     QuicReceivedPacketManager* received_packet_manager,
     QuicPacketNumber least_unacked) {