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 c168313202e0e97c2a3ed054956f71e486efde44..5d715db4ef5c58ed14047604f5b0dd23e0ebe78b 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -70,17 +70,15 @@ QuicTime::Delta QuicConnectionPeer::GetNetworkTimeout(
 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