Cleanup RtpSender hiding RtpHeaderExtensionLength function.

webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

 /*
  *  Copyright (c) 2012 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 228 matching lines @@
  protected:
   void SetUp() override {
     // TODO(pbos): Set up to use pacer.
     SetUpRtpSender(false);
     rtp_sender_video_.reset(
         new RTPSenderVideo(&fake_clock_, rtp_sender_.get(), nullptr));
   }
   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;
   csrcs.push_back(0x23456789);
   rtp_sender_->SetCsrcs(csrcs);
 
   auto packet = rtp_sender_->AllocatePacket();
 
   ASSERT_TRUE(packet);
   EXPECT_EQ(rtp_sender_->SSRC(), packet->Ssrc());
@@ skipping 1163 matching lines @@
   EXPECT_CALL(mock_overhead_observer, OnOverheadChanged(_)).Times(1);
   rtp_sender_->SetTransportOverhead(28);
   rtp_sender_->SetTransportOverhead(28);
 
   EXPECT_CALL(mock_overhead_observer, OnOverheadChanged(_)).Times(1);
   SendGenericPayload();
   SendGenericPayload();
 }
 
 }  // namespace webrtc