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

net/quic/core/quic_multipath_sent_packet_manager.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.
 
 #ifndef NET_QUIC_QUIC_MULTIPATH_SENT_PACKET_MANAGER_H_
 #define NET_QUIC_QUIC_MULTIPATH_SENT_PACKET_MANAGER_H_
 
 #include <vector>
 
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_connection_close_delegate_interface.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_sent_packet_manager.h"
 #include "net/quic/core/quic_sent_packet_manager_interface.h"
 
 namespace net {
 
 namespace test {
 class QuicConnectionPeer;
 class QuicMultipathSentPacketManagerPeer;
 }  // namespace test
 
@@ skipping 44 matching lines @@
 
   // Removes the retransmittable frames from all unencrypted packets on the
   // default path to ensure they don't get retransmitted.
   void NeuterUnencryptedPackets() override;
 
   // Returns true if there are pending retransmissions.
   bool HasPendingRetransmissions() const override;
 
   // Retrieves the next pending retransmission.  Caller must ensure that
   // there are pending retransmissions prior to calling this function.
-  PendingRetransmission NextPendingRetransmission() override;
+  QuicPendingRetransmission NextPendingRetransmission() override;
 
   // Returns true if the any path has unacked packets.
   bool HasUnackedPackets() const override;
 
   // Returns the smallest packet number of a serialized packet which has not
   // been acked on |path_id|.
   QuicPacketNumber GetLeastUnacked(QuicPathId path_id) const override;
 
   // Called when a packet has been sent to the peer. If this packet is a
   // retransmission on a different path than the original packet, records the
@@ skipping 72 matching lines @@
   // Returns true if the default path is in slow start.
   bool InSlowStart() const override;
 
   // These two methods return the consecutive RTO or TLP count of the default
   // path.
   size_t GetConsecutiveRtoCount() const override;
   size_t GetConsecutiveTlpCount() const override;
 
   void OnApplicationLimited() override;
 
+  const SendAlgorithmInterface* GetSendAlgorithm() const override;
+
  private:
   friend class test::QuicConnectionPeer;
   friend class test::QuicMultipathSentPacketManagerPeer;
 
   // State of per path sent packet manager.
   // TODO(fayang): Need to add a state that path can receive acks but cannot
   // send data.
   enum PathSentPacketManagerState {
     ACTIVE,   // We both send packets and receiving acks on this path.
     CLOSING,  // We stop sending packets and receiving acks on this path. There
@@ skipping 32 matching lines @@
 
   // Does not own this delegate.
   QuicConnectionCloseDelegateInterface* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicMultipathSentPacketManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_MULTIPATH_SENT_PACKET_MANAGER_H_