Land Recent QUIC changes.

net/quic/test_tools/quic_connection_peer.h

Index: net/quic/test_tools/quic_connection_peer.h
diff --git a/net/quic/test_tools/quic_connection_peer.h b/net/quic/test_tools/quic_connection_peer.h
index 89c6482e1894087671e6c776d4cac31542fcedea..e2b4ff989a207a7462c1d58cab2bdf115437efc4 100644
--- a/net/quic/test_tools/quic_connection_peer.h
+++ b/net/quic/test_tools/quic_connection_peer.h
@@ -12,8 +12,11 @@
 namespace net {
 
 struct QuicAckFrame;
+struct QuicPacketHeader;
 class QuicConnection;
+class QuicConnectionHelperInterface;
 class QuicConnectionVisitorInterface;
+class QuicFecGroup;
 class QuicFramer;
 class QuicPacketCreator;
 class ReceiveAlgorithmInterface;
@@ -43,6 +46,8 @@ class QuicConnectionPeer {
 
   static size_t GetNumRetransmissionTimeouts(QuicConnection* connection);
 
+  static QuicTime::Delta GetTimeout(QuicConnection* connection);
+
   static bool IsSavedForRetransmission(
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
@@ -70,6 +75,14 @@ class QuicConnectionPeer {
 
   static void SwapCrypters(QuicConnection* connection, QuicFramer* framer);
 
+  static void SetMaxPacketsPerRetransmissionAlarm(QuicConnection* connection,
+                                                  int max_packets);
+
+  static QuicConnectionHelperInterface* GetHelper(QuicConnection* connection);
+
+  // Set last_header_->fec_group = fec_group and return connection->GetFecGroup
+  static QuicFecGroup* GetFecGroup(QuicConnection* connection, int fec_group);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };