Cleanup RtpSender hiding RtpHeaderExtensionLength function.

webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 929f5b2097d1e37db7d56d1ee0d73416eed446d0..a9e9485e5c90ce6a06c9b590d939d9d99a9b684d 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;