Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/test_tools/quic_packet_creator_peer.h

Index: net/quic/test_tools/quic_packet_creator_peer.h
diff --git a/net/quic/test_tools/quic_packet_creator_peer.h b/net/quic/test_tools/quic_packet_creator_peer.h
index 3970e6e6d8129912440883328f4a865f8eb5c07e..cc17ca931de1012b0740511d2af311b21a85c2fd 100644
--- a/net/quic/test_tools/quic_packet_creator_peer.h
+++ b/net/quic/test_tools/quic_packet_creator_peer.h
@@ -50,9 +50,13 @@ class QuicPacketCreatorPeer {
   static bool IsFecEnabled(QuicPacketCreator* creator);
   static void StartFecProtectingPackets(QuicPacketCreator* creator);
   static void StopFecProtectingPackets(QuicPacketCreator* creator);
-  static SerializedPacket SerializeFec(QuicPacketCreator* creator,
-                                       char* buffer,
-                                       size_t buffer_len);
+  static void SerializeFec(QuicPacketCreator* creator,
+                           char* buffer,
+                           size_t buffer_len);
+  static SerializedPacket SerializeAllFrames(QuicPacketCreator* creator,
+                                             const QuicFrames& frames,
+                                             char* buffer,
+                                             size_t buffer_len);
   static void ResetFecGroup(QuicPacketCreator* creator);
   static QuicTime::Delta GetFecTimeout(QuicPacketCreator* creator);
   // TODO(rtenneti): Delete this code after the 0.25 RTT FEC experiment.