Change from WebRtcRTPHeader to RTPHeader in NetEq tests and tools

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

Index: webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc
diff --git a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc b/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc
index f837ad6362aa299141a5449e12c133aadfa64320..5fabb6f4922864699351eb301f3955317cce7752 100644
--- a/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc
@@ -52,7 +52,7 @@ void EncodeNetEqInput::AdvanceOutputEvent() {
 
 rtc::Optional<RTPHeader> EncodeNetEqInput::NextHeader() const {
   RTC_DCHECK(packet_data_);
-  return rtc::Optional<RTPHeader>(packet_data_->header.header);
+  return rtc::Optional<RTPHeader>(packet_data_->header);
 }
 
 void EncodeNetEqInput::CreatePacket() {
@@ -77,9 +77,9 @@ void EncodeNetEqInput::CreatePacket() {
         encoder_->SampleRateHz());
     ++num_blocks;
   }
-  packet_data_->header.header.timestamp = info.encoded_timestamp;
-  packet_data_->header.header.payloadType = info.payload_type;
-  packet_data_->header.header.sequenceNumber = sequence_number_++;
+  packet_data_->header.timestamp = info.encoded_timestamp;
+  packet_data_->header.payloadType = info.payload_type;
+  packet_data_->header.sequenceNumber = sequence_number_++;
   packet_data_->time_ms = next_packet_time_ms_;
   next_packet_time_ms_ += num_blocks * kOutputPeriodMs;
 }