Land Recent QUIC changes.

net/quic/quic_fec_group.h

 // 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.
 //
 // Tracks information about an FEC group, including the packets
 // that have been seen, and the running parity.  Provided the ability
 // to revive a dropped packet.
 
 #ifndef NET_QUIC_QUIC_FEC_GROUP_H_
 #define NET_QUIC_QUIC_FEC_GROUP_H_
@@ skipping 11 matching lines @@
   ~QuicFecGroup();
 
   // Updates the FEC group based on the delivery of a data packet.
   // Returns false if this packet has already been seen, true otherwise.
   bool Update(const QuicPacketHeader& header,
               base::StringPiece decrypted_payload);
 
   // Updates the FEC group based on the delivery of an FEC packet.
   // Returns false if this packet has already been seen or if it does
   // not claim to protect all the packets previously seen in this group.
+  //   |fec_packet_entropy|: XOR of entropy of all packets in the fec group.
   bool UpdateFec(QuicPacketSequenceNumber fec_packet_sequence_number,
-                 bool fec_entropy_flag,
+                 bool fec_packet_entropy,
                  const QuicFecData& fec);
 
   // Returns true if a packet can be revived from this FEC group.
   bool CanRevive() const;
 
   // Returns true if all packets (FEC and data) from this FEC group have been
   // seen or revived
   bool IsFinished() const;
 
   // Revives the missing packet from this FEC group.  This may return a packet
@@ skipping 44 matching lines @@
   char payload_parity_[kMaxPacketSize];
   size_t payload_parity_len_;
   bool entropy_parity_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicFecGroup);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_FEC_GROUP_H_