Remove use of RtpHeaderExtension and clean up

webrtc/call/rtc_event_log_unittest_helper.cc

 /*
  *  Copyright (c) 2016 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 135 matching lines @@
   }
   // Check header extensions.
   ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
             receiver_config.header_extensions_size());
   for (int i = 0; i < receiver_config.header_extensions_size(); i++) {
     ASSERT_TRUE(receiver_config.header_extensions(i).has_name());
     ASSERT_TRUE(receiver_config.header_extensions(i).has_id());
     const std::string& name = receiver_config.header_extensions(i).name();
     int id = receiver_config.header_extensions(i).id();
     EXPECT_EQ(config.rtp.extensions[i].id, id);
-    EXPECT_EQ(config.rtp.extensions[i].name, name);
+    EXPECT_EQ(config.rtp.extensions[i].uri, name);
   }
   // Check decoders.
   ASSERT_EQ(static_cast<int>(config.decoders.size()),
             receiver_config.decoders_size());
   for (int i = 0; i < receiver_config.decoders_size(); i++) {
     ASSERT_TRUE(receiver_config.decoders(i).has_name());
     ASSERT_TRUE(receiver_config.decoders(i).has_payload_type());
     const std::string& decoder_name = receiver_config.decoders(i).name();
     int decoder_type = receiver_config.decoders(i).payload_type();
     EXPECT_EQ(config.decoders[i].payload_name, decoder_name);
@@ skipping 12 matching lines @@
   EXPECT_EQ(config.rtp.rtx.size(), parsed_config.rtp.rtx.size());
   for (const auto& kv : config.rtp.rtx) {
     auto parsed_kv = parsed_config.rtp.rtx.find(kv.first);
     EXPECT_EQ(kv.first, parsed_kv->first);
     EXPECT_EQ(kv.second.ssrc, parsed_kv->second.ssrc);
     EXPECT_EQ(kv.second.payload_type, parsed_kv->second.payload_type);
   }
   // Check header extensions.
   EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
   for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
-    EXPECT_EQ(config.rtp.extensions[i].name,
-              parsed_config.rtp.extensions[i].name);
+    EXPECT_EQ(config.rtp.extensions[i].uri,
+              parsed_config.rtp.extensions[i].uri);
     EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
   }
   // Check decoders.
   EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size());
   for (size_t i = 0; i < parsed_config.decoders.size(); i++) {
     EXPECT_EQ(config.decoders[i].payload_name,
               parsed_config.decoders[i].payload_name);
     EXPECT_EQ(config.decoders[i].payload_type,
               parsed_config.decoders[i].payload_type);
   }
@@ skipping 15 matching lines @@
   }
   // Check header extensions.
   ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
             sender_config.header_extensions_size());
   for (int i = 0; i < sender_config.header_extensions_size(); i++) {
     ASSERT_TRUE(sender_config.header_extensions(i).has_name());
     ASSERT_TRUE(sender_config.header_extensions(i).has_id());
     const std::string& name = sender_config.header_extensions(i).name();
     int id = sender_config.header_extensions(i).id();
     EXPECT_EQ(config.rtp.extensions[i].id, id);
-    EXPECT_EQ(config.rtp.extensions[i].name, name);
+    EXPECT_EQ(config.rtp.extensions[i].uri, name);
   }
   // Check RTX settings.
   ASSERT_EQ(static_cast<int>(config.rtp.rtx.ssrcs.size()),
             sender_config.rtx_ssrcs_size());
   for (int i = 0; i < sender_config.rtx_ssrcs_size(); i++) {
     EXPECT_EQ(config.rtp.rtx.ssrcs[i], sender_config.rtx_ssrcs(i));
   }
   if (sender_config.rtx_ssrcs_size() > 0) {
     ASSERT_TRUE(sender_config.has_rtx_payload_type());
     EXPECT_EQ(config.rtp.rtx.payload_type, sender_config.rtx_payload_type());
@@ skipping 11 matching lines @@
   VideoSendStream::Config parsed_config(nullptr);
   parsed_log.GetVideoSendConfig(index, &parsed_config);
   // Check SSRCs
   EXPECT_EQ(config.rtp.ssrcs.size(), parsed_config.rtp.ssrcs.size());
   for (size_t i = 0; i < config.rtp.ssrcs.size(); i++) {
     EXPECT_EQ(config.rtp.ssrcs[i], parsed_config.rtp.ssrcs[i]);
   }
   // Check header extensions.
   EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
   for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
-    EXPECT_EQ(config.rtp.extensions[i].name,
-              parsed_config.rtp.extensions[i].name);
+    EXPECT_EQ(config.rtp.extensions[i].uri,
+              parsed_config.rtp.extensions[i].uri);
     EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
   }
   // Check RTX settings.
   EXPECT_EQ(config.rtp.rtx.ssrcs.size(), parsed_config.rtp.rtx.ssrcs.size());
   for (size_t i = 0; i < config.rtp.rtx.ssrcs.size(); i++) {
     EXPECT_EQ(config.rtp.rtx.ssrcs[i], parsed_config.rtp.rtx.ssrcs[i]);
   }
   EXPECT_EQ(config.rtp.rtx.payload_type, parsed_config.rtp.rtx.payload_type);
   // Check encoder.
   EXPECT_EQ(config.encoder_settings.payload_name,
@@ skipping 130 matching lines @@
     const ParsedRtcEventLog& parsed_log,
     size_t index) {
   const rtclog::Event& event = parsed_log.stream_[index];
   ASSERT_TRUE(IsValidBasicEvent(event));
   EXPECT_EQ(rtclog::Event::LOG_END, event.type());
 }
 
 }  // namespace webrtc
 
 #endif  // ENABLE_RTC_EVENT_LOG