Merge the QUIC unacked packet map with the unacked fec packet map and

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 66 matching lines @@
 
 // static
 bool QuicConnectionPeer::IsRetransmission(
     QuicConnection* connection,
     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);
 }
 
 // static
 bool QuicConnectionPeer::IsValidEntropy(
     QuicConnection* connection,
     QuicPacketSequenceNumber largest_observed,
@@ skipping 74 matching lines @@
   return connection->ack_alarm_.get();
 }
 
 // static
 QuicAlarm* QuicConnectionPeer::GetRetransmissionAlarm(
     QuicConnection* connection) {
   return connection->retransmission_alarm_.get();
 }
 
 // static
-QuicAlarm* QuicConnectionPeer::GetAbandonFecAlarm(QuicConnection* connection) {
-  return connection->abandon_fec_alarm_.get();
-}
-
-// static
 QuicAlarm* QuicConnectionPeer::GetSendAlarm(QuicConnection* connection) {
   return connection->send_alarm_.get();
 }
 
 // static
 QuicAlarm* QuicConnectionPeer::GetResumeWritesAlarm(
     QuicConnection* connection) {
   return connection->resume_writes_alarm_.get();
 }
 
 // static
 QuicAlarm* QuicConnectionPeer::GetTimeoutAlarm(QuicConnection* connection) {
   return connection->timeout_alarm_.get();
 }
 
 // static
 QuicPacketWriter* QuicConnectionPeer::GetWriter(QuicConnection* connection) {
   return connection->writer_;
 }
 
 // static
 void QuicConnectionPeer::SetWriter(QuicConnection* connection,
                                    QuicTestWriter* writer) {
   connection->writer_ = writer;
 }
 
 }  // namespace test
 }  // namespace net