Landing 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 b7526563bba7a59f013be6c2a6797a0de3276ca5..a14824918f855497761c24e744acb01de5f1cb03 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -107,15 +107,18 @@ bool QuicConnectionPeer::IsRetransmission(
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return connection->sent_entropy_manager_.EntropyHash(sequence_number);
+  QuicSentEntropyManager::CumulativeEntropy last_entropy_copy =
+      connection->sent_entropy_manager_.last_cumulative_entropy_;
+  connection->sent_entropy_manager_.UpdateCumulativeEntropy(sequence_number,
+                                                            &last_entropy_copy);
+  return last_entropy_copy.entropy;
 }
 
 // static
 QuicPacketEntropyHash QuicConnectionPeer::PacketEntropy(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return
-      connection->sent_entropy_manager_.packets_entropy_[sequence_number].first;
+  return connection->sent_entropy_manager_.GetPacketEntropy(sequence_number);
 }
 
 // static