Landing Recent QUIC changes until 3:24 PM, Oct 01, 2016 UTC-4

net/quic/core/quic_multipath_received_packet_manager.cc

 // Copyright (c) 2015 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_received_packet_manager.h"
 
 #include "base/stl_util.h"
 
 #include "net/quic/core/quic_bug_tracker.h"
 
@@ skipping 27 matching lines @@
              << static_cast<uint32_t>(path_id);
     return;
   }
 
   delete manager;
   path_managers_.erase(path_id);
 }
 
 void QuicMultipathReceivedPacketManager::RecordPacketReceived(
     QuicPathId path_id,
-    QuicByteCount bytes,
     const QuicPacketHeader& header,
     QuicTime receipt_time) {
   QuicReceivedPacketManager* manager = path_managers_[path_id];
   if (manager == nullptr) {
     QUIC_BUG << "Received a packet on a non-existent path.";
     return;
   }
 
-  manager->RecordPacketReceived(bytes, header, receipt_time);
+  manager->RecordPacketReceived(header, receipt_time);
 }
 
 bool QuicMultipathReceivedPacketManager::IsMissing(
     QuicPathId path_id,
     QuicPacketNumber packet_number) {
   QuicReceivedPacketManager* manager = path_managers_[path_id];
   if (manager == nullptr) {
     QUIC_BUG << "Check whether a packet is missing on a non-existent path.";
     return true;
   }
@@ skipping 42 matching lines @@
   if (manager == nullptr) {
     QUIC_BUG
         << "Try to get peer_least_packet_awaiting_ack of a non-existent path.";
     return false;
   }
 
   return manager->peer_least_packet_awaiting_ack();
 }
 
 }  // namespace net