Land Recent QUIC changes.

net/quic/quic_fec_group_test.cc

Index: net/quic/quic_fec_group_test.cc
diff --git a/net/quic/quic_fec_group_test.cc b/net/quic/quic_fec_group_test.cc
index 7372a1107dc6db84aafe6468ecf0eed102f3482c..d9c303aee5b345a7e036f36dfb08051767a625b0 100644
--- a/net/quic/quic_fec_group_test.cc
+++ b/net/quic/quic_fec_group_test.cc
@@ -35,7 +35,7 @@ const bool kEntropyFlag[] = {
   true,
 };
 
-const bool kTestFecEntropy = false;
+const bool kTestFecPacketEntropy = false;
 
 }  // namespace
 
@@ -157,7 +157,7 @@ TEST_F(QuicFecGroupTest, UpdateFecIfReceivedPacketIsNotCovered) {
   fec.redundancy = redundancy;
 
   header.packet_sequence_number = 2;
-  ASSERT_FALSE(group.UpdateFec(2, kTestFecEntropy, fec));
+  ASSERT_FALSE(group.UpdateFec(2, kTestFecPacketEntropy, fec));
 }
 
 TEST_F(QuicFecGroupTest, ProtectsPacketsBefore) {
@@ -206,7 +206,7 @@ TEST_F(QuicFecGroupTest, ProtectsPacketsBeforeWithFecData) {
   fec.redundancy = kData[0];
 
   QuicFecGroup group;
-  ASSERT_TRUE(group.UpdateFec(3, kTestFecEntropy, fec));
+  ASSERT_TRUE(group.UpdateFec(3, kTestFecPacketEntropy, fec));
 
   EXPECT_FALSE(group.ProtectsPacketsBefore(1));
   EXPECT_FALSE(group.ProtectsPacketsBefore(2));