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

net/quic/core/quic_multipath_sent_packet_manager.h

Index: net/quic/core/quic_multipath_sent_packet_manager.h
diff --git a/net/quic/core/quic_multipath_sent_packet_manager.h b/net/quic/core/quic_multipath_sent_packet_manager.h
index 5aff14a93ac9d983ed21f17f93b8dfc2239a0373..b5162480313ee04b310ce70d4197aa3c28157fd0 100644
--- a/net/quic/core/quic_multipath_sent_packet_manager.h
+++ b/net/quic/core/quic_multipath_sent_packet_manager.h
@@ -9,7 +9,7 @@
 
 #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"
 
@@ -74,7 +74,7 @@ class NET_EXPORT_PRIVATE QuicMultipathSentPacketManager
 
   // 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;
@@ -167,6 +167,8 @@ class NET_EXPORT_PRIVATE QuicMultipathSentPacketManager
 
   void OnApplicationLimited() override;
 
+  const SendAlgorithmInterface* GetSendAlgorithm() const override;
+
  private:
   friend class test::QuicConnectionPeer;
   friend class test::QuicMultipathSentPacketManagerPeer;