Land 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/quic_congestion_manager.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
@@ skipping 71 matching lines @@
   QuicConnection::RetransmissionMap::iterator it =
       connection->retransmission_map_.find(sequence_number);
   DCHECK(connection->retransmission_map_.end() != it);
   return it->second.number_retransmissions;
 }
 
 // static
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return connection->entropy_manager_.SentEntropyHash(sequence_number);
+  return connection->sent_entropy_manager_.EntropyHash(sequence_number);
 }
 
 // static
 bool QuicConnectionPeer::IsValidEntropy(
     QuicConnection* connection,
     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);
 }
 
 // static
 QuicPacketEntropyHash QuicConnectionPeer::ReceivedEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return connection->entropy_manager_.ReceivedEntropyHash(sequence_number);
+  return connection->received_entropy_manager_.EntropyHash(
+      sequence_number);
 }
 
 // static
 bool QuicConnectionPeer::IsServer(QuicConnection* connection) {
   return connection->is_server_;
 }
 
 // static
 void QuicConnectionPeer::SetIsServer(QuicConnection* connection,
                                      bool is_server) {
@@ skipping 27 matching lines @@
 }
 
 QuicFecGroup* QuicConnectionPeer::GetFecGroup(QuicConnection* connection,
                                               int fec_group) {
   connection->last_header_.fec_group = fec_group;
   return connection->GetFecGroup();
 }
 
 }  // namespace test
 }  // namespace net