Reorder member functions in FecReceiver unit test. (pt. 10)

webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 27 matching lines @@
 using Packet = ::webrtc::ForwardErrorCorrection::Packet;
 using ::webrtc::test::fec::UlpfecPacketGenerator;
 
 class ReceiverFecTest : public ::testing::Test {
  protected:
   ReceiverFecTest()
       : fec_(ForwardErrorCorrection::CreateUlpfec()),
         receiver_fec_(FecReceiver::Create(&rtp_data_callback_)),
         packet_generator_(kMediaSsrc) {}
 
+  // Generates |num_fec_packets| FEC packets, given |media_packets|.
   void EncodeFec(const ForwardErrorCorrection::PacketList& media_packets,
                  size_t num_fec_packets,
-                 std::list<ForwardErrorCorrection::Packet*>* fec_packets) {
-    uint8_t protection_factor = num_fec_packets * 255 / media_packets.size();
-    constexpr int kNumImportantPackets =
-        0;  // Irrelevant, since unequal protection is turned off.
-    constexpr bool kUseUnequalProtection = false;
-    constexpr FecMaskType kFecMaskType = kFecMaskBursty;
-    EXPECT_EQ(0, fec_->EncodeFec(media_packets, protection_factor,
-                                 kNumImportantPackets, kUseUnequalProtection,
-                                 kFecMaskType, fec_packets));
-    ASSERT_EQ(num_fec_packets, fec_packets->size());
-  }
+                 std::list<ForwardErrorCorrection::Packet*>* fec_packets);
 
-  void GenerateFrame(size_t num_media_packets,
-                     size_t frame_offset,
-                     std::list<AugmentedPacket*>* augmented_packets,
-                     ForwardErrorCorrection::PacketList* media_packets) {
-    packet_generator_.NewFrame(num_media_packets);
-    for (size_t i = 0; i < num_media_packets; ++i) {
-      std::unique_ptr<AugmentedPacket> next_packet(
-          packet_generator_.NextPacket(frame_offset + i, kRtpHeaderSize + 10));
-      augmented_packets->push_back(next_packet.get());
-      media_packets->push_back(std::move(next_packet));
-    }
-  }
+  // Generates |num_media_packets| corresponding to a single frame.
+  void PacketizeFrame(size_t num_media_packets,
+                      size_t frame_offset,
+                      std::list<AugmentedPacket*>* augmented_packets,
+                      ForwardErrorCorrection::PacketList* packets);
 
+  // Build a media packet using |packet_generator_| and add it
+  // to the receiver.
+  void BuildAndAddRedMediaPacket(AugmentedPacket* packet);
+
+  // Build a FEC packet using |packet_generator_| and add it
+  // to the receiver.
+  void BuildAndAddRedFecPacket(Packet* packet);
+
+  // Ensure that |rtp_data_callback_| will be called correctly
+  // and that the recovered packet will be identical to the lost packet.
   void VerifyReconstructedMediaPacket(const AugmentedPacket* packet,
-                                      size_t times) {
-    // Verify that the content of the reconstructed packet is equal to the
-    // content of |packet|, and that the same content is received |times| number
-    // of times in a row.
-    EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, packet->length))
-        .With(Args<0, 1>(ElementsAreArray(packet->data,
-                                          packet->length)))
-        .Times(times).WillRepeatedly(Return(true));
-  }
-
-  void BuildAndAddRedMediaPacket(AugmentedPacket* packet) {
-    std::unique_ptr<AugmentedPacket> red_packet(
-        packet_generator_.BuildMediaRedPacket(*packet));
-    EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket(
-                     red_packet->header.header, red_packet->data,
-                     red_packet->length, kFecPayloadType));
-  }
-
-  void BuildAndAddRedFecPacket(Packet* packet) {
-    std::unique_ptr<AugmentedPacket> red_packet(
-        packet_generator_.BuildUlpfecRedPacket(*packet));
-    EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket(
-                     red_packet->header.header, red_packet->data,
-                     red_packet->length, kFecPayloadType));
-  }
+                                      size_t times);
 
   void InjectGarbagePacketLength(size_t fec_garbage_offset);
+
   static void SurvivesMaliciousPacket(const uint8_t* data,
                                       size_t length,
                                       uint8_t ulpfec_payload_type);
 
   MockRtpData rtp_data_callback_;
   std::unique_ptr<ForwardErrorCorrection> fec_;
   std::unique_ptr<FecReceiver> receiver_fec_;
   UlpfecPacketGenerator packet_generator_;
 };
 
-TEST_F(ReceiverFecTest, TwoMediaOneFec) {
-  constexpr size_t kNumFecPackets = 1u;
-  std::list<AugmentedPacket*> augmented_media_packets;
-  ForwardErrorCorrection::PacketList media_packets;
-  GenerateFrame(2, 0, &augmented_media_packets, &media_packets);
-  std::list<ForwardErrorCorrection::Packet*> fec_packets;
-  EncodeFec(media_packets, kNumFecPackets, &fec_packets);
+void ReceiverFecTest::EncodeFec(
+    const ForwardErrorCorrection::PacketList& media_packets,
+    size_t num_fec_packets,
+    std::list<ForwardErrorCorrection::Packet*>* fec_packets) {
+  const uint8_t protection_factor =
+      num_fec_packets * 255 / media_packets.size();
+  constexpr int kNumImportantPackets =
+      0;  // Irrelevant, since unequal protection is turned off.

[philipel, 2016/09/05 13:55:58]

Move comment to its own line.

[brandtr, 2016/09/05 14:38:48]

Done.

+  constexpr bool kUseUnequalProtection = false;
+  constexpr FecMaskType kFecMaskType = kFecMaskBursty;
+  EXPECT_EQ(
+      0, fec_->EncodeFec(media_packets, protection_factor, kNumImportantPackets,
+                         kUseUnequalProtection, kFecMaskType, fec_packets));
+  ASSERT_EQ(num_fec_packets, fec_packets->size());
+}
 
-  // Recovery
-  auto it = augmented_media_packets.begin();
-  BuildAndAddRedMediaPacket(*it);
-  VerifyReconstructedMediaPacket(*it, 1);
-  EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
-  // Drop one media packet.
-  auto fec_it = fec_packets.begin();
-  BuildAndAddRedFecPacket(*fec_it);
-  ++it;
-  VerifyReconstructedMediaPacket(*it, 1);
-  EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
+void ReceiverFecTest::PacketizeFrame(
+    size_t num_media_packets,
+    size_t frame_offset,
+    std::list<AugmentedPacket*>* augmented_packets,
+    ForwardErrorCorrection::PacketList* packets) {
+  packet_generator_.NewFrame(num_media_packets);
+  for (size_t i = 0; i < num_media_packets; ++i) {
+    std::unique_ptr<AugmentedPacket> next_packet(
+        packet_generator_.NextPacket(frame_offset + i, kRtpHeaderSize + 10));
+    augmented_packets->push_back(next_packet.get());
+    packets->push_back(std::move(next_packet));
+  }
+}
 
-  FecPacketCounter counter = receiver_fec_->GetPacketCounter();
-  EXPECT_EQ(2u, counter.num_packets);
-  EXPECT_EQ(1u, counter.num_fec_packets);
-  EXPECT_EQ(1u, counter.num_recovered_packets);
+void ReceiverFecTest::BuildAndAddRedMediaPacket(AugmentedPacket* packet) {
+  std::unique_ptr<AugmentedPacket> red_packet(
+      packet_generator_.BuildMediaRedPacket(*packet));
+  EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket(
+                   red_packet->header.header, red_packet->data,
+                   red_packet->length, kFecPayloadType));
+}
+
+void ReceiverFecTest::BuildAndAddRedFecPacket(Packet* packet) {
+  std::unique_ptr<AugmentedPacket> red_packet(
+      packet_generator_.BuildUlpfecRedPacket(*packet));
+  EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket(
+                   red_packet->header.header, red_packet->data,
+                   red_packet->length, kFecPayloadType));
+}
+
+void ReceiverFecTest::VerifyReconstructedMediaPacket(
+    const AugmentedPacket* packet,
+    size_t times) {
+  // Verify that the content of the reconstructed packet is equal to the
+  // content of |packet|, and that the same content is received |times| number
+  // of times in a row.
+  EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, packet->length))
+      .With(Args<0, 1>(ElementsAreArray(packet->data, packet->length)))
+      .Times(times)
+      .WillRepeatedly(Return(true));
 }
 
 void ReceiverFecTest::InjectGarbagePacketLength(size_t fec_garbage_offset) {
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .WillRepeatedly(Return(true));
 
   constexpr size_t kNumFecPackets = 1u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
-  GenerateFrame(2, 0, &augmented_media_packets, &media_packets);
+  PacketizeFrame(2, 0, &augmented_media_packets, &media_packets);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets, kNumFecPackets, &fec_packets);
   ByteWriter<uint16_t>::WriteBigEndian(
       &fec_packets.front()->data[fec_garbage_offset], 0x4711);
 
   // Inject first media packet, then first FEC packet, skipping the second media
   // packet to cause a recovery from the FEC packet.
   BuildAndAddRedMediaPacket(augmented_media_packets.front());
   BuildAndAddRedFecPacket(fec_packets.front());
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 
   FecPacketCounter counter = receiver_fec_->GetPacketCounter();
   EXPECT_EQ(2u, counter.num_packets);
   EXPECT_EQ(1u, counter.num_fec_packets);
   EXPECT_EQ(0u, counter.num_recovered_packets);
 }
 
+void ReceiverFecTest::SurvivesMaliciousPacket(const uint8_t* data,
+                                              size_t length,
+                                              uint8_t ulpfec_payload_type) {
+  webrtc::RTPHeader header;
+  std::unique_ptr<webrtc::RtpHeaderParser> parser(
+      webrtc::RtpHeaderParser::Create());
+  ASSERT_TRUE(parser->Parse(data, length, &header));
+
+  webrtc::NullRtpData null_callback;
+  std::unique_ptr<webrtc::FecReceiver> receiver_fec(
+      webrtc::FecReceiver::Create(&null_callback));
+
+  receiver_fec->AddReceivedRedPacket(header, data, length, ulpfec_payload_type);
+}
+
+TEST_F(ReceiverFecTest, TwoMediaOneFec) {
+  constexpr size_t kNumFecPackets = 1u;
+  std::list<AugmentedPacket*> augmented_media_packets;
+  ForwardErrorCorrection::PacketList media_packets;
+  PacketizeFrame(2, 0, &augmented_media_packets, &media_packets);
+  std::list<ForwardErrorCorrection::Packet*> fec_packets;
+  EncodeFec(media_packets, kNumFecPackets, &fec_packets);
+
+  // Recovery
+  auto it = augmented_media_packets.begin();
+  BuildAndAddRedMediaPacket(*it);
+  VerifyReconstructedMediaPacket(*it, 1);
+  EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
+  // Drop one media packet.
+  auto fec_it = fec_packets.begin();
+  BuildAndAddRedFecPacket(*fec_it);
+  ++it;
+  VerifyReconstructedMediaPacket(*it, 1);
+  EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
+
+  FecPacketCounter counter = receiver_fec_->GetPacketCounter();
+  EXPECT_EQ(2u, counter.num_packets);
+  EXPECT_EQ(1u, counter.num_fec_packets);
+  EXPECT_EQ(1u, counter.num_recovered_packets);
+}
+
 TEST_F(ReceiverFecTest, InjectGarbageFecHeaderLengthRecovery) {
   // Byte offset 8 is the 'length recovery' field of the FEC header.
   InjectGarbagePacketLength(8);
 }
 
 TEST_F(ReceiverFecTest, InjectGarbageFecLevelHeaderProtectionLength) {
   // Byte offset 10 is the 'protection length' field in the first FEC level
   // header.
   InjectGarbagePacketLength(10);
 }
 
 TEST_F(ReceiverFecTest, TwoMediaTwoFec) {
   constexpr size_t kNumFecPackets = 2u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
-  GenerateFrame(2, 0, &augmented_media_packets, &media_packets);
+  PacketizeFrame(2, 0, &augmented_media_packets, &media_packets);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets, kNumFecPackets, &fec_packets);
 
   // Recovery
   // Drop both media packets.
   auto it = augmented_media_packets.begin();
   auto fec_it = fec_packets.begin();
   BuildAndAddRedFecPacket(*fec_it);
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   ++fec_it;
   BuildAndAddRedFecPacket(*fec_it);
   ++it;
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, TwoFramesOneFec) {
   constexpr size_t kNumFecPackets = 1u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
-  GenerateFrame(1, 0, &augmented_media_packets, &media_packets);
-  GenerateFrame(1, 1, &augmented_media_packets, &media_packets);
+  PacketizeFrame(1, 0, &augmented_media_packets, &media_packets);
+  PacketizeFrame(1, 1, &augmented_media_packets, &media_packets);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets, kNumFecPackets, &fec_packets);
 
   // Recovery
   auto it = augmented_media_packets.begin();
   BuildAndAddRedMediaPacket(augmented_media_packets.front());
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   // Drop one media packet.
   BuildAndAddRedFecPacket(fec_packets.front());
   ++it;
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, OneCompleteOneUnrecoverableFrame) {
   constexpr size_t kNumFecPackets = 1u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
-  GenerateFrame(1, 0, &augmented_media_packets, &media_packets);
-  GenerateFrame(2, 1, &augmented_media_packets, &media_packets);
+  PacketizeFrame(1, 0, &augmented_media_packets, &media_packets);
+  PacketizeFrame(2, 1, &augmented_media_packets, &media_packets);
 
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets, kNumFecPackets, &fec_packets);
 
   // Recovery
   auto it = augmented_media_packets.begin();
   BuildAndAddRedMediaPacket(*it);  // First frame: one packet.
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   ++it;
   BuildAndAddRedMediaPacket(*it);  // First packet of second frame.
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, MaxFramesOneFec) {
   constexpr size_t kNumFecPackets = 1u;
   constexpr size_t kNumMediaPackets = 48u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
   for (size_t i = 0; i < kNumMediaPackets; ++i) {
-    GenerateFrame(1, i, &augmented_media_packets, &media_packets);
+    PacketizeFrame(1, i, &augmented_media_packets, &media_packets);
   }
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets, kNumFecPackets, &fec_packets);
 
   // Recovery
   auto it = augmented_media_packets.begin();
   ++it;  // Drop first packet.
   for (; it != augmented_media_packets.end(); ++it) {
     BuildAndAddRedMediaPacket(*it);
     VerifyReconstructedMediaPacket(*it, 1);
     EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   }
   BuildAndAddRedFecPacket(fec_packets.front());
   it = augmented_media_packets.begin();
   VerifyReconstructedMediaPacket(*it, 1);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, TooManyFrames) {
   constexpr size_t kNumFecPackets = 1u;
   constexpr size_t kNumMediaPackets = 49u;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
   for (size_t i = 0; i < kNumMediaPackets; ++i) {
-    GenerateFrame(1, i, &augmented_media_packets, &media_packets);
+    PacketizeFrame(1, i, &augmented_media_packets, &media_packets);
   }
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EXPECT_EQ(-1, fec_->EncodeFec(media_packets,
                                 kNumFecPackets * 255 / kNumMediaPackets, 0,
                                 false, kFecMaskBursty, &fec_packets));
 }
 
 TEST_F(ReceiverFecTest, PacketNotDroppedTooEarly) {
   // 1 frame with 2 media packets and one FEC packet. One media packet missing.
   // Delay the FEC packet.
   Packet* delayed_fec = NULL;
   constexpr size_t kNumFecPacketsBatch1 = 1u;
   constexpr size_t kNumMediaPacketsBatch1 = 2u;
   std::list<AugmentedPacket*> augmented_media_packets_batch1;
   ForwardErrorCorrection::PacketList media_packets_batch1;
-  GenerateFrame(kNumMediaPacketsBatch1, 0, &augmented_media_packets_batch1,
-                &media_packets_batch1);
+  PacketizeFrame(kNumMediaPacketsBatch1, 0, &augmented_media_packets_batch1,
+                 &media_packets_batch1);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets_batch1, kNumFecPacketsBatch1, &fec_packets);
 
   BuildAndAddRedMediaPacket(augmented_media_packets_batch1.front());
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .Times(1).WillRepeatedly(Return(true));
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   delayed_fec = fec_packets.front();
 
   // Fill the FEC decoder. No packets should be dropped.
   constexpr size_t kNumMediaPacketsBatch2 = 46u;
   std::list<AugmentedPacket*> augmented_media_packets_batch2;
   ForwardErrorCorrection::PacketList media_packets_batch2;
   for (size_t i = 0; i < kNumMediaPacketsBatch2; ++i) {
-    GenerateFrame(1, i, &augmented_media_packets_batch2, &media_packets_batch2);
+    PacketizeFrame(1, i, &augmented_media_packets_batch2,
+                   &media_packets_batch2);
   }
   for (auto it = augmented_media_packets_batch2.begin();
        it != augmented_media_packets_batch2.end(); ++it) {
     BuildAndAddRedMediaPacket(*it);
     EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
         .Times(1).WillRepeatedly(Return(true));
     EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   }
 
   // Add the delayed FEC packet. One packet should be reconstructed.
   BuildAndAddRedFecPacket(delayed_fec);
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .Times(1).WillRepeatedly(Return(true));
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, PacketDroppedWhenTooOld) {
   // 1 frame with 2 media packets and one FEC packet. One media packet missing.
   // Delay the FEC packet.
   Packet* delayed_fec = nullptr;
   constexpr size_t kNumFecPacketsBatch1 = 1u;
   constexpr size_t kNumMediaPacketsBatch1 = 2u;
   std::list<AugmentedPacket*> augmented_media_packets_batch1;
   ForwardErrorCorrection::PacketList media_packets_batch1;
-  GenerateFrame(kNumMediaPacketsBatch1, 0, &augmented_media_packets_batch1,
-                &media_packets_batch1);
+  PacketizeFrame(kNumMediaPacketsBatch1, 0, &augmented_media_packets_batch1,
+                 &media_packets_batch1);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(media_packets_batch1, kNumFecPacketsBatch1, &fec_packets);
 
   BuildAndAddRedMediaPacket(augmented_media_packets_batch1.front());
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .Times(1).WillRepeatedly(Return(true));
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   delayed_fec = fec_packets.front();
 
   // Fill the FEC decoder and force the last packet to be dropped.
   constexpr size_t kNumMediaPacketsBatch2 = 48u;
   std::list<AugmentedPacket*> augmented_media_packets_batch2;
   ForwardErrorCorrection::PacketList media_packets_batch2;
   for (size_t i = 0; i < kNumMediaPacketsBatch2; ++i) {
-    GenerateFrame(1, i, &augmented_media_packets_batch2, &media_packets_batch2);
+    PacketizeFrame(1, i, &augmented_media_packets_batch2,
+                   &media_packets_batch2);
   }
   for (auto it = augmented_media_packets_batch2.begin();
        it != augmented_media_packets_batch2.end(); ++it) {
     BuildAndAddRedMediaPacket(*it);
     EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
         .Times(1).WillRepeatedly(Return(true));
     EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
   }
 
   // Add the delayed FEC packet. No packet should be reconstructed since the
   // first media packet of that frame has been dropped due to being too old.
   BuildAndAddRedFecPacket(delayed_fec);
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .Times(0);
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
 TEST_F(ReceiverFecTest, OldFecPacketDropped) {
   // 49 frames with 2 media packets and one FEC packet. All media packets
   // missing.
   constexpr size_t kNumMediaPackets = 49 * 2;
   std::list<AugmentedPacket*> augmented_media_packets;
   ForwardErrorCorrection::PacketList media_packets;
   for (size_t i = 0; i < kNumMediaPackets / 2; ++i) {
     std::list<AugmentedPacket*> frame_augmented_media_packets;
     ForwardErrorCorrection::PacketList frame_media_packets;
     std::list<ForwardErrorCorrection::Packet*> fec_packets;
-    GenerateFrame(2, 0, &frame_augmented_media_packets, &frame_media_packets);
+    PacketizeFrame(2, 0, &frame_augmented_media_packets, &frame_media_packets);
     EncodeFec(frame_media_packets, 1, &fec_packets);
     for (auto it = fec_packets.begin(); it != fec_packets.end(); ++it) {
       // Only FEC packets inserted. No packets recoverable at this time.
       BuildAndAddRedFecPacket(*it);
       EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
           .Times(0);
       EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
     }
     // Move unique_ptr's to media_packets for lifetime management.
     media_packets.insert(media_packets.end(),
                          std::make_move_iterator(frame_media_packets.begin()),
                          std::make_move_iterator(frame_media_packets.end()));
     augmented_media_packets.insert(augmented_media_packets.end(),
                                    frame_augmented_media_packets.begin(),
                                    frame_augmented_media_packets.end());
   }
   // Insert the oldest media packet. The corresponding FEC packet is too old
   // and should have been dropped. Only the media packet we inserted will be
   // returned.
   BuildAndAddRedMediaPacket(augmented_media_packets.front());
   EXPECT_CALL(rtp_data_callback_, OnRecoveredPacket(_, _))
       .Times(1).WillRepeatedly(Return(true));
   EXPECT_EQ(0, receiver_fec_->ProcessReceivedFec());
 }
 
-void ReceiverFecTest::SurvivesMaliciousPacket(const uint8_t* data,
-                                              size_t length,
-                                              uint8_t ulpfec_payload_type) {
-  webrtc::RTPHeader header;
-  std::unique_ptr<webrtc::RtpHeaderParser> parser(
-      webrtc::RtpHeaderParser::Create());
-  ASSERT_TRUE(parser->Parse(data, length, &header));
-
-  webrtc::NullRtpData null_callback;
-  std::unique_ptr<webrtc::FecReceiver> receiver_fec(
-      webrtc::FecReceiver::Create(&null_callback));
-
-  receiver_fec->AddReceivedRedPacket(header, data, length, ulpfec_payload_type);
-}
-
 TEST_F(ReceiverFecTest, TruncatedPacketWithFBitSet) {
   const uint8_t kTruncatedPacket[] = {0x80,
                                       0x2a,
                                       0x68,
                                       0x71,
                                       0x29,
                                       0xa1,
                                       0x27,
                                       0x3a,
                                       0x29,
@@ skipping 94 matching lines @@
                              0x27,
                              0xc4,
                              0x2a,
                              0x21,
                              0x2a,
                              0x28};
   SurvivesMaliciousPacket(kPacket, sizeof(kPacket), 100);
 }
 
 }  // namespace webrtc