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

net/quic/core/quic_multipath_received_packet_manager.cc

Index: net/quic/core/quic_multipath_received_packet_manager.cc
diff --git a/net/quic/core/quic_multipath_received_packet_manager.cc b/net/quic/core/quic_multipath_received_packet_manager.cc
index 8c404834efd5dfd4d4b880f948f807a4a839557a..3440495c5df86d678b153e91eb144e54af91b7b3 100644
--- a/net/quic/core/quic_multipath_received_packet_manager.cc
+++ b/net/quic/core/quic_multipath_received_packet_manager.cc
@@ -45,7 +45,6 @@ void QuicMultipathReceivedPacketManager::OnPathClosed(QuicPathId path_id) {
 
 void QuicMultipathReceivedPacketManager::RecordPacketReceived(
     QuicPathId path_id,
-    QuicByteCount bytes,
     const QuicPacketHeader& header,
     QuicTime receipt_time) {
   QuicReceivedPacketManager* manager = path_managers_[path_id];
@@ -54,7 +53,7 @@ void QuicMultipathReceivedPacketManager::RecordPacketReceived(
     return;
   }
 
-  manager->RecordPacketReceived(bytes, header, receipt_time);
+  manager->RecordPacketReceived(header, receipt_time);
 }
 
 bool QuicMultipathReceivedPacketManager::IsMissing(