Land Recent QUIC changes.

net/quic/quic_fec_group_test.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 <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_fec_group.h"
@@ skipping 17 matching lines @@
 
 const bool kEntropyFlag[] = {
   false,
   true,
   true,
   false,
   true,
   true,
 };
 
-const bool kTestFecEntropy = false;
+const bool kTestFecPacketEntropy = false;
 
 }  // namespace
 
 class QuicFecGroupTest : public ::testing::Test {
  protected:
   void RunTest(size_t num_packets, size_t lost_packet, bool out_of_order) {
     size_t max_len = strlen(kData[0]);
     scoped_ptr<char[]>redundancy(new char[max_len]);
     bool entropy_redundancy = false;
     for (size_t packet = 0; packet < num_packets; ++packet) {
@@ skipping 101 matching lines @@
 
   QuicPacketHeader header;
   header.packet_sequence_number = 3;
   group.Update(header, data1);
 
   QuicFecData fec;
   fec.fec_group = 1;
   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) {
   QuicPacketHeader header;
   header.packet_sequence_number = 3;
 
   QuicFecGroup group;
   ASSERT_TRUE(group.Update(header, kData[0]));
 
   EXPECT_FALSE(group.ProtectsPacketsBefore(1));
@@ skipping 28 matching lines @@
   EXPECT_TRUE(group.ProtectsPacketsBefore(9));
   EXPECT_TRUE(group.ProtectsPacketsBefore(50));
 }
 
 TEST_F(QuicFecGroupTest, ProtectsPacketsBeforeWithFecData) {
   QuicFecData fec;
   fec.fec_group = 2;
   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));
   EXPECT_TRUE(group.ProtectsPacketsBefore(3));
   EXPECT_TRUE(group.ProtectsPacketsBefore(4));
   EXPECT_TRUE(group.ProtectsPacketsBefore(5));
   EXPECT_TRUE(group.ProtectsPacketsBefore(50));
 }
 
 }  // namespace net