message: Removes using imports from flexfec_receiver.
  The imports of Packet, ReceivedPacket from ForwardErrorCorrection::
  collides with other usages of the names introduced in a followup CL.
  Cr-Commit-Position: refs/heads/master@{#28075}
diff: @@ -21,9 +21,6 @@ namespace webrtc {
  namespace {
  -using Packet = ForwardErrorCorrection::Packet;
  -using ReceivedPacket = ForwardErrorCorrection::ReceivedPacket;
  -
  // Minimum header size (in bytes) of a well-formed non-singular FlexFEC packet.
  constexpr size_t kMinFlexfecHeaderSize = 20;
  @@ -71,7 +68,8 @@ void FlexfecReceiver::OnRtpPacket(const RtpPacketReceived& packet) {
  if (packet.recovered())
  return;
  - std::unique_ptr<ReceivedPacket> received_packet = AddReceivedPacket(packet);
  + std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet =
  + AddReceivedPacket(packet);
  if (!received_packet)
  return;
  @@ -85,8 +83,8 @@ FecPacketCounter FlexfecReceiver::GetPacketCounter() const {
  // TODO(eladalon): Consider using packet.recovered() to avoid processing
  // recovered packets here.
  -std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
  - const RtpPacketReceived& packet) {
  +std::unique_ptr<ForwardErrorCorrection::ReceivedPacket>
  +FlexfecReceiver::AddReceivedPacket(const RtpPacketReceived& packet) {
  RTC_DCHECK_RUN_ON(&sequence_checker_);
  // RTP packets with a full base header (12 bytes), but without payload,
  @@ -95,7 +93,8 @@ std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
  RTC_DCHECK_GE(packet.size(), kRtpHeaderSize);
  // Demultiplex based on SSRC, and insert into erasure code decoder.
  - std::unique_ptr<ReceivedPacket> received_packet(new ReceivedPacket());
  + std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet(
  + new ForwardErrorCorrection::ReceivedPacket());
  received_packet->seq_num = packet.SequenceNumber();
  received_packet->ssrc = packet.Ssrc();
  if (received_packet->ssrc == ssrc_) {
  @@ -110,7 +109,8 @@ std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
  // Insert packet payload into erasure code.
  // TODO(brandtr): Remove this memcpy when the FEC packet classes
  // are using COW buffers internally.
  - received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
  + received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
  + new ForwardErrorCorrection::Packet());
  auto payload = packet.payload();
  memcpy(received_packet->pkt->data, payload.data(), payload.size());
  received_packet->pkt->length = payload.size();
  @@ -124,7 +124,8 @@ std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
  // Insert entire packet into erasure code.
  // TODO(brandtr): Remove this memcpy too.
  - received_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
  + received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
  + new ForwardErrorCorrection::Packet());
  memcpy(received_packet->pkt->data, packet.data(), packet.size());
  received_packet->pkt->length = packet.size();
  }
  @@ -144,7 +145,7 @@ std::unique_ptr<ReceivedPacket> FlexfecReceiver::AddReceivedPacket(
  // FlexFEC decoder, and we therefore do not interfere with the reception
  // of non-recovered media packets.
  void FlexfecReceiver::ProcessReceivedPacket(
  - const ReceivedPacket& received_packet) {
  + const ForwardErrorCorrection::ReceivedPacket& received_packet) {
  RTC_DCHECK_RUN_ON(&sequence_checker_);
  // Decode.
  