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

net/quic/core/quic_multipath_sent_packet_manager.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/core/quic_multipath_sent_packet_manager.h"
 
 #include <cstdint>
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/core/quic_bug_tracker.h"
@@ skipping 111 matching lines @@
 }
 
 bool QuicMultipathSentPacketManager::HasPendingRetransmissions() const {
   // TODO(fayang): Move pending_retransmissions_ from path sent packet manager
   // to multipath sent packet manager.
   QuicSentPacketManagerInterface* path_manager =
       MaybeGetSentPacketManagerForActivePath(kDefaultPathId);
   return path_manager != nullptr && path_manager->HasPendingRetransmissions();
 }
 
-PendingRetransmission
+QuicPendingRetransmission
 QuicMultipathSentPacketManager::NextPendingRetransmission() {
   // TODO(fayang): Move pending_retransmissions_ from path sent packet manager
   // to multipath sent packet manager.
   QuicSentPacketManagerInterface* path_manager =
       MaybeGetSentPacketManagerForActivePath(kDefaultPathId);
   if (path_manager == nullptr) {
     OnUnrecoverablePathError(kDefaultPathId);
     QuicFrames retransmittable_frames;
-    return PendingRetransmission(kInvalidPathId, 0u, NOT_RETRANSMISSION,
-                                 retransmittable_frames, false, 0,
-                                 ENCRYPTION_NONE, PACKET_1BYTE_PACKET_NUMBER);
+    return QuicPendingRetransmission(
+        kInvalidPathId, 0u, NOT_RETRANSMISSION, retransmittable_frames, false,
+        0, ENCRYPTION_NONE, PACKET_1BYTE_PACKET_NUMBER);
   }
   return path_manager->NextPendingRetransmission();
 }
 
 bool QuicMultipathSentPacketManager::HasUnackedPackets() const {
   for (PathSentPacketManagerInfo path_manager_info : path_managers_info_) {
     if (path_manager_info.manager != nullptr &&
         path_manager_info.state == ACTIVE &&
         path_manager_info.manager->HasUnackedPackets()) {
       return true;
@@ skipping 360 matching lines @@
 void QuicMultipathSentPacketManager::OnApplicationLimited() {
   for (PathSentPacketManagerInfo& path_manager_info : path_managers_info_) {
     if (path_manager_info.manager == nullptr ||
         path_manager_info.state != ACTIVE) {
       continue;
     }
     path_manager_info.manager->OnApplicationLimited();
   }
 }
 
+const SendAlgorithmInterface* QuicMultipathSentPacketManager::GetSendAlgorithm()
+    const {
+  QuicSentPacketManagerInterface* path_manager =
+      MaybeGetSentPacketManagerForActivePath(kDefaultPathId);
+  if (path_manager == nullptr) {
+    return nullptr;
+  }
+  return path_manager->GetSendAlgorithm();
+}
+
 }  // namespace net