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

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 e305cbea8cdba843eab04499a570bc8b61e89ed9..54410b3bec188acaf6c00168e6209aa8ff4c00e2 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -84,6 +84,7 @@ bool QuicConnectionPeer::IsRetransmission(
 }
 
 // static
+// TODO(ianswett): Create a GetSentEntropyHash which accepts an AckFrame.
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
@@ -178,11 +179,6 @@ QuicAlarm* QuicConnectionPeer::GetRetransmissionAlarm(
 }
 
 // static
-QuicAlarm* QuicConnectionPeer::GetAbandonFecAlarm(QuicConnection* connection) {
-  return connection->abandon_fec_alarm_.get();
-}
-
-// static
 QuicAlarm* QuicConnectionPeer::GetSendAlarm(QuicConnection* connection) {
   return connection->send_alarm_.get();
 }