Landing Recent QUIC Changes.

net/quic/test_tools/quic_connection_peer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/quic_connection_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_connection.h"
@@ skipping 89 matching lines @@
     QuicPacketSequenceNumber sequence_number) {
   return QuicSentPacketManagerPeer::IsRetransmission(
       &connection->sent_packet_manager_, sequence_number);
 }
 
 // static
 // TODO(ianswett): Create a GetSentEntropyHash which accepts an AckFrame.
 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
 QuicPacketEntropyHash QuicConnectionPeer::ReceivedEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
   return connection->received_packet_manager_.EntropyHash(
       sequence_number);
 }
 
@@ skipping 105 matching lines @@
 }
 
 // static
 void QuicConnectionPeer::SetSupportedVersions(QuicConnection* connection,
                                               QuicVersionVector versions) {
   connection->framer_.SetSupportedVersions(versions);
 }
 
 }  // namespace test
 }  // namespace net