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

net/quic/test_tools/quic_connection_peer.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_
 
 #include "base/basictypes.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/quic_connection_stats.h"
@@ skipping 80 matching lines @@
 
   static QuicConnectionHelperInterface* GetHelper(QuicConnection* connection);
 
   static QuicFramer* GetFramer(QuicConnection* connection);
 
   // Set last_header_->fec_group = fec_group and return connection->GetFecGroup
   static QuicFecGroup* GetFecGroup(QuicConnection* connection, int fec_group);
 
   static QuicAlarm* GetAckAlarm(QuicConnection* connection);
   static QuicAlarm* GetRetransmissionAlarm(QuicConnection* connection);
-  static QuicAlarm* GetAbandonFecAlarm(QuicConnection* connection);
   static QuicAlarm* GetSendAlarm(QuicConnection* connection);
   static QuicAlarm* GetResumeWritesAlarm(QuicConnection* connection);
   static QuicAlarm* GetTimeoutAlarm(QuicConnection* connection);
 
   static QuicPacketWriter* GetWriter(QuicConnection* connection);
   static void SetWriter(QuicConnection* connection, QuicTestWriter* writer);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PEER_H_