Land Recent QUIC changes.

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 8c4c24554bfe8735b180a5ac025096c355ce463a..330aa06b46048e9205df3737790900d24e6db1d9 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -89,7 +89,7 @@ size_t QuicConnectionPeer::GetRetransmissionCount(
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return connection->entropy_manager_.SentEntropyHash(sequence_number);
+  return connection->sent_entropy_manager_.EntropyHash(sequence_number);
 }
 
 // static
@@ -98,7 +98,7 @@ bool QuicConnectionPeer::IsValidEntropy(
     QuicPacketSequenceNumber largest_observed,
     const SequenceNumberSet& missing_packets,
     QuicPacketEntropyHash entropy_hash) {
-  return connection->entropy_manager_.IsValidEntropy(
+  return connection->sent_entropy_manager_.IsValidEntropy(
       largest_observed, missing_packets, entropy_hash);
 }
 
@@ -106,7 +106,8 @@ bool QuicConnectionPeer::IsValidEntropy(
 QuicPacketEntropyHash QuicConnectionPeer::ReceivedEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return connection->entropy_manager_.ReceivedEntropyHash(sequence_number);
+  return connection->received_entropy_manager_.EntropyHash(
+      sequence_number);
 }
 
 // static