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

net/quic/quic_packet_generator.cc

 // 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.
 
 #include "net/quic/quic_packet_generator.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_fec_group.h"
 #include "net/quic/quic_flags.h"
@@ skipping 289 matching lines @@
   if (packet_creator_.CanSetMaxPacketLength()) {
     packet_creator_.SetMaxPacketLength(length);
   }
 }
 
 QuicEncryptedPacket* QuicPacketGenerator::SerializeVersionNegotiationPacket(
     const QuicVersionVector& supported_versions) {
   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(
     QuicPacketNumber least_packet_awaited_by_peer,
     QuicPacketCount max_packets_in_flight) {
   return packet_creator_.UpdatePacketNumberLength(least_packet_awaited_by_peer,
                                                   max_packets_in_flight);
 }
 
 void QuicPacketGenerator::SetConnectionIdLength(uint32_t length) {
@@ skipping 33 matching lines @@
 
 FecSendPolicy QuicPacketGenerator::fec_send_policy() {
   return packet_creator_.fec_send_policy();
 }
 
 void QuicPacketGenerator::set_fec_send_policy(FecSendPolicy fec_send_policy) {
   packet_creator_.set_fec_send_policy(fec_send_policy);
 }
 
 }  // namespace net