diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
index 04c742651f..931f9e39a2 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
@@ -222,11 +222,6 @@ int32_t RTPSender::DeregisterRtpHeaderExtension(RTPExtensionType type) {
   return rtp_header_extension_map_.Deregister(type);
 }
 
-size_t RTPSender::RtpHeaderExtensionLength() const {
-  rtc::CritScope lock(&send_critsect_);
-  return rtp_header_extension_map_.GetTotalLengthInBytes();
-}
-
 int32_t RTPSender::RegisterPayload(
     const char payload_name[RTP_PAYLOAD_NAME_SIZE],
     int8_t payload_number,
@@ -978,7 +973,7 @@ size_t RTPSender::RtpHeaderLength() const {
   rtc::CritScope lock(&send_critsect_);
   size_t rtp_header_length = kRtpHeaderLength;
   rtp_header_length += sizeof(uint32_t) * csrcs_.size();
-  rtp_header_length += RtpHeaderExtensionLength();
+  rtp_header_length += rtp_header_extension_map_.GetTotalLengthInBytes();
   return rtp_header_length;
 }
 
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
index 758e4d3238..56a5b6aba5 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
@@ -123,8 +123,6 @@ class RTPSender {
   bool IsRtpHeaderExtensionRegistered(RTPExtensionType type);
   int32_t DeregisterRtpHeaderExtension(RTPExtensionType type);
 
-  size_t RtpHeaderExtensionLength() const;
-
   bool TimeToSendPacket(uint32_t ssrc,
                         uint16_t sequence_number,
                         int64_t capture_time_ms,
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 929f5b2097..a9e9485e5c 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -246,108 +246,6 @@ class RtpSenderVideoTest : public RtpSenderTest {
   std::unique_ptr<RTPSenderVideo> rtp_sender_video_;
 };
 
-TEST_F(RtpSenderTestWithoutPacer,
-       RegisterRtpTransmissionTimeOffsetHeaderExtension) {
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
-                   kRtpExtensionTransmissionTimeOffset,
-                   kTransmissionTimeOffsetExtensionId));
-  EXPECT_EQ(kRtpOneByteHeaderLength + kTransmissionTimeOffsetLength,
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->DeregisterRtpHeaderExtension(
-                   kRtpExtensionTransmissionTimeOffset));
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-}
-
-TEST_F(RtpSenderTestWithoutPacer, RegisterRtpAbsoluteSendTimeHeaderExtension) {
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(
-      0, rtp_sender_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime,
-                                                 kAbsoluteSendTimeExtensionId));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kAbsoluteSendTimeLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->DeregisterRtpHeaderExtension(
-                   kRtpExtensionAbsoluteSendTime));
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-}
-
-TEST_F(RtpSenderTestWithoutPacer, RegisterRtpAudioLevelHeaderExtension) {
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(kRtpExtensionAudioLevel,
-                                                       kAudioLevelExtensionId));
-  EXPECT_EQ(
-      RtpUtility::Word32Align(kRtpOneByteHeaderLength + kAudioLevelLength),
-      rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0,
-            rtp_sender_->DeregisterRtpHeaderExtension(kRtpExtensionAudioLevel));
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-}
-
-TEST_F(RtpSenderTestWithoutPacer, RegisterRtpHeaderExtensions) {
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
-                   kRtpExtensionTransmissionTimeOffset,
-                   kTransmissionTimeOffsetExtensionId));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kTransmissionTimeOffsetLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(
-      0, rtp_sender_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime,
-                                                 kAbsoluteSendTimeExtensionId));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kTransmissionTimeOffsetLength +
-                                    kAbsoluteSendTimeLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(kRtpExtensionAudioLevel,
-                                                       kAudioLevelExtensionId));
-  EXPECT_EQ(RtpUtility::Word32Align(
-                kRtpOneByteHeaderLength + kTransmissionTimeOffsetLength +
-                kAbsoluteSendTimeLength + kAudioLevelLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
-                   kRtpExtensionVideoRotation, kVideoRotationExtensionId));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kTransmissionTimeOffsetLength +
-                                    kAbsoluteSendTimeLength +
-                                    kAudioLevelLength + kVideoRotationLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-
-  // Deregister starts.
-  EXPECT_EQ(0, rtp_sender_->DeregisterRtpHeaderExtension(
-                   kRtpExtensionTransmissionTimeOffset));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kAbsoluteSendTimeLength +
-                                    kAudioLevelLength + kVideoRotationLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->DeregisterRtpHeaderExtension(
-                   kRtpExtensionAbsoluteSendTime));
-  EXPECT_EQ(RtpUtility::Word32Align(kRtpOneByteHeaderLength +
-                                    kAudioLevelLength + kVideoRotationLength),
-            rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0,
-            rtp_sender_->DeregisterRtpHeaderExtension(kRtpExtensionAudioLevel));
-  EXPECT_EQ(
-      RtpUtility::Word32Align(kRtpOneByteHeaderLength + kVideoRotationLength),
-      rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(
-      0, rtp_sender_->DeregisterRtpHeaderExtension(kRtpExtensionVideoRotation));
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-}
-
-TEST_F(RtpSenderTestWithoutPacer, RegisterRtpVideoRotationHeaderExtension) {
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
-                   kRtpExtensionVideoRotation, kVideoRotationExtensionId));
-
-  EXPECT_EQ(
-      RtpUtility::Word32Align(kRtpOneByteHeaderLength + kVideoRotationLength),
-      rtp_sender_->RtpHeaderExtensionLength());
-  EXPECT_EQ(
-      0, rtp_sender_->DeregisterRtpHeaderExtension(kRtpExtensionVideoRotation));
-  EXPECT_EQ(0u, rtp_sender_->RtpHeaderExtensionLength());
-}
-
 TEST_F(RtpSenderTestWithoutPacer, AllocatePacketSetCsrc) {
   // Configure rtp_sender with csrc.
   std::vector<uint32_t> csrcs;