Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/quic_packet_generator.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.
 //
 // Responsible for generating packets on behalf of a QuicConnection.
 // Packets are serialized just-in-time.  Control frames are queued.
 // Ack and Feedback frames will be requested from the Connection
 // just-in-time.  When a packet needs to be sent, the Generator
 // will serialize a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
@@ skipping 30 matching lines @@
 #define NET_QUIC_QUIC_PACKET_GENERATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <list>
 
 #include "base/macros.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_packet_creator.h"
+#include "net/quic/core/quic_pending_retransmission.h"
 #include "net/quic/core/quic_sent_packet_manager.h"
 #include "net/quic/core/quic_types.h"
 
 namespace net {
 
 namespace test {
 class QuicPacketGeneratorPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicPacketGenerator {
@@ skipping 72 matching lines @@
   // header of packets encrypted at the initial encryption level. Should only
   // be called by servers.
   void SetDiversificationNonce(const DiversificationNonce& nonce);
 
   // Creates a version negotiation packet which supports |supported_versions|.
   std::unique_ptr<QuicEncryptedPacket> SerializeVersionNegotiationPacket(
       const QuicVersionVector& supported_versions);
 
   // Re-serializes frames with the original packet's packet number length.
   // Used for retransmitting packets to ensure they aren't too long.
-  void ReserializeAllFrames(const PendingRetransmission& retransmission,
+  void ReserializeAllFrames(const QuicPendingRetransmission& retransmission,
                             char* buffer,
                             size_t buffer_len);
 
   // Update the packet number length to use in future packets as soon as it
   // can be safely changed.
   void UpdateSequenceNumberLength(QuicPacketNumber least_packet_awaited_by_peer,
                                   QuicPacketCount max_packets_in_flight);
 
   // Set the minimum number of bytes for the connection id length;
   void SetConnectionIdLength(uint32_t length);
@@ skipping 56 matching lines @@
   // are referenced elsewhere so that they can later be (optionally)
   // retransmitted.
   QuicStopWaitingFrame pending_stop_waiting_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_GENERATOR_H_