webrtc::RtpPacket name freed for better RtpPacket

webrtc/modules/rtp_rtcp/source/fec_test_helper.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
 
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 
 namespace webrtc {
+namespace test {
+struct RawRtpPacket : public ForwardErrorCorrection::Packet {
+  WebRtcRTPHeader header;
+};
+}  // namespace test
 
 const uint8_t kFecPayloadType = 96;
 const uint8_t kRedPayloadType = 97;
 const uint8_t kVp8PayloadType = 120;
 
-typedef ForwardErrorCorrection::Packet Packet;
-
-struct RtpPacket : public Packet {
-  WebRtcRTPHeader header;
-};
-
 class FrameGenerator {
  public:
   FrameGenerator();
 
   void NewFrame(int num_packets);
 
   uint16_t NextSeqNum();
 
-  RtpPacket* NextPacket(int offset, size_t length);
+  test::RawRtpPacket* NextPacket(int offset, size_t length);
 
   // Creates a new RtpPacket with the RED header added to the packet.
-  RtpPacket* BuildMediaRedPacket(const RtpPacket* packet);
+  test::RawRtpPacket* BuildMediaRedPacket(const test::RawRtpPacket* packet);
 
   // Creates a new RtpPacket with FEC payload and red header. Does this by
   // creating a new fake media RtpPacket, clears the marker bit and adds a RED
   // header. Finally replaces the payload with the content of |packet->data|.
-  RtpPacket* BuildFecRedPacket(const Packet* packet);
+  test::RawRtpPacket* BuildFecRedPacket(
+      const ForwardErrorCorrection::Packet* packet);
 
-  void SetRedHeader(Packet* red_packet, uint8_t payload_type,
+  void SetRedHeader(ForwardErrorCorrection::Packet* red_packet,
+                    uint8_t payload_type,
                     size_t header_length) const;
 
  private:
   static void BuildRtpHeader(uint8_t* data, const RTPHeader* header);
 
   int num_packets_;
   uint16_t seq_num_;
   uint32_t timestamp_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_