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 52 matching lines @@
 // static
 QuicTime::Delta QuicConnectionPeer::GetNetworkTimeout(
     QuicConnection* connection) {
   return connection->idle_network_timeout_;
 }
 
 // static
 bool QuicConnectionPeer::IsSavedForRetransmission(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  return ContainsKey(connection->retransmission_map_, sequence_number);
+  return connection->sent_packet_manager_.IsUnacked(sequence_number);
 }
 
 // static
 size_t QuicConnectionPeer::GetRetransmissionCount(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
-  QuicConnection::RetransmissionMap::iterator it =
-      connection->retransmission_map_.find(sequence_number);
-  DCHECK(connection->retransmission_map_.end() != it);
-  return it->second.number_retransmissions;
+  return connection->sent_packet_manager_.GetRetransmissionCount(
+      sequence_number);
 }
 
 // static
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
   return connection->sent_entropy_manager_.EntropyHash(sequence_number);
 }
 
 // static
@@ skipping 84 matching lines @@
   return connection->send_alarm_.get();
 }
 
 // static
 QuicAlarm* QuicConnectionPeer::GetTimeoutAlarm(QuicConnection* connection) {
   return connection->timeout_alarm_.get();
 }
 
 }  // namespace test
 }  // namespace net