Change from WebRtcRTPHeader to RTPHeader in NetEq tests and tools

webrtc/modules/audio_coding/neteq/tools/neteq_test.cc

Index: webrtc/modules/audio_coding/neteq/tools/neteq_test.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc
index 13b11e8c7f6b8ac22336e05bad362c2bfb9843e5..fb000252bc2853e7a82ba7c5345b39c3eabba25b 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_test.cc
@@ -22,15 +22,15 @@ void DefaultNetEqTestErrorCallback::OnInsertPacketError(
     const NetEqInput::PacketData& packet) {
   if (error_code == NetEq::kUnknownRtpPayloadType) {
     std::cerr << "RTP Payload type "
-              << static_cast<int>(packet.header.header.payloadType)
-              << " is unknown." << std::endl;
+              << static_cast<int>(packet.header.payloadType) << " is unknown."
+              << std::endl;
   } else {
     std::cerr << "InsertPacket returned error code " << error_code << std::endl;
     std::cerr << "Header data:" << std::endl;
-    std::cerr << "  PT = " << static_cast<int>(packet.header.header.payloadType)
+    std::cerr << "  PT = " << static_cast<int>(packet.header.payloadType)
               << std::endl;
-    std::cerr << "  SN = " << packet.header.header.sequenceNumber << std::endl;
-    std::cerr << "  TS = " << packet.header.header.timestamp << std::endl;
+    std::cerr << "  SN = " << packet.header.sequenceNumber << std::endl;
+    std::cerr << "  TS = " << packet.header.timestamp << std::endl;
   }
   FATAL();
 }
@@ -70,7 +70,7 @@ int64_t NetEqTest::Run() {
       std::unique_ptr<NetEqInput::PacketData> packet_data = input_->PopPacket();
       RTC_CHECK(packet_data);
       int error = neteq_->InsertPacket(
-          packet_data->header.header,
+          packet_data->header,
           rtc::ArrayView<const uint8_t>(packet_data->payload),
           static_cast<uint32_t>(packet_data->time_ms * sample_rate_hz_ / 1000));
       if (error != NetEq::kOK && error_callback_) {