Remove use of RtpHeaderExtension and clean up

webrtc/call/rtc_event_log_unittest_helper.cc

Index: webrtc/call/rtc_event_log_unittest_helper.cc
diff --git a/webrtc/call/rtc_event_log_unittest_helper.cc b/webrtc/call/rtc_event_log_unittest_helper.cc
index 5a06d97170e4047c9babfd9f6bdb22d560b9a7bd..dcaeaf979c7b9984d5f13843d634f9cf83d7eac8 100644
--- a/webrtc/call/rtc_event_log_unittest_helper.cc
+++ b/webrtc/call/rtc_event_log_unittest_helper.cc
@@ -153,7 +153,7 @@ void RtcEventLogTestHelper::VerifyReceiveStreamConfig(
     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()),
@@ -186,8 +186,8 @@ void RtcEventLogTestHelper::VerifyReceiveStreamConfig(
   // 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.
@@ -223,7 +223,7 @@ void RtcEventLogTestHelper::VerifySendStreamConfig(
     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()),
@@ -255,8 +255,8 @@ void RtcEventLogTestHelper::VerifySendStreamConfig(
   // 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.