Landing Recent QUIC changes until 2/12/2016 21:32 UTC

net/quic/quic_packet_generator.cc

Index: net/quic/quic_packet_generator.cc
diff --git a/net/quic/quic_packet_generator.cc b/net/quic/quic_packet_generator.cc
index f4bd4fc592c405c826a9e75c46fc5d7383e87297..f9d6ed1b7a66048ee59b0647c33df7109e333a5d 100644
--- a/net/quic/quic_packet_generator.cc
+++ b/net/quic/quic_packet_generator.cc
@@ -307,12 +307,11 @@ QuicEncryptedPacket* QuicPacketGenerator::SerializeVersionNegotiationPacket(
   return packet_creator_.SerializeVersionNegotiationPacket(supported_versions);
 }
 
-SerializedPacket QuicPacketGenerator::ReserializeAllFrames(
+void QuicPacketGenerator::ReserializeAllFrames(
     const PendingRetransmission& retransmission,
     char* buffer,
     size_t buffer_len) {
-  return packet_creator_.ReserializeAllFrames(retransmission, buffer,
-                                              buffer_len);
+  packet_creator_.ReserializeAllFrames(retransmission, buffer, buffer_len);
 }
 
 void QuicPacketGenerator::UpdateSequenceNumberLength(