Land Recent QUIC changes.

net/quic/quic_fec_group.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/quic_fec_group.h"
 
 #include <limits>
 
 #include "base/logging.h"
 
@@ skipping 31 matching lines @@
   }
   if (!UpdateParity(decrypted_payload, header.entropy_flag)) {
     return false;
   }
   received_packets_.insert(header.packet_sequence_number);
   return true;
 }
 
 bool QuicFecGroup::UpdateFec(
     QuicPacketSequenceNumber fec_packet_sequence_number,
-    bool fec_entropy_flag,
+    bool fec_packet_entropy,
     const QuicFecData& fec) {
   if (min_protected_packet_ != kNoSequenceNumber) {
     return false;
   }
   SequenceNumberSet::const_iterator it = received_packets_.begin();
   while (it != received_packets_.end()) {
     if ((*it < fec.fec_group) ||
         (*it >= fec_packet_sequence_number)) {
       DLOG(ERROR) << "FEC group does not cover received packet: " << *it;
       return false;
     }
     ++it;
   }
-  if (!UpdateParity(fec.redundancy, fec_entropy_flag)) {
+  if (!UpdateParity(fec.redundancy, fec_packet_entropy)) {
     return false;
   }
   min_protected_packet_ = fec.fec_group;
   max_protected_packet_ = fec_packet_sequence_number - 1;
   return true;
 }
 
 bool QuicFecGroup::CanRevive() const {
   // We can revive if we're missing exactly 1 packet.
   return NumMissingPackets() == 1;
@@ skipping 80 matching lines @@
 }
 
 size_t QuicFecGroup::NumMissingPackets() const {
   if (min_protected_packet_ == kNoSequenceNumber)
     return numeric_limits<size_t>::max();
   return (max_protected_packet_ - min_protected_packet_ + 1) -
       received_packets_.size();
 }
 
 }  // namespace net