[Draft] RtpPacket sketched.

webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index b992d2da909345272eb4de4c84bab955d7ce1a4b..141a010e83b7bc27a18f9f7051047f527db93022 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -14,7 +14,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/random.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions_manager.h"
 
 using testing::ElementsAreArray;
 using testing::make_tuple;
@@ -77,8 +77,7 @@ TEST(RtpPacketTest, CreateMinimum) {
 
 TEST(RtpPacketTest, CreateWithExtension) {
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
   RtpPacketToSend packet(&extensions);
   packet.SetPayloadType(kPayloadType);
   packet.SetSequenceNumber(kSeqNum);
@@ -90,9 +89,8 @@ TEST(RtpPacketTest, CreateWithExtension) {
 
 TEST(RtpPacketTest, CreateWith2Extensions) {
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
-  extensions.Register(kRtpExtensionAudioLevel, kAudioLevelExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
+  extensions.Register<AudioLevel>(kAudioLevelExtensionId);
   RtpPacketToSend packet(&extensions);
   packet.SetPayloadType(kPayloadType);
   packet.SetSequenceNumber(kSeqNum);
@@ -107,9 +105,8 @@ TEST(RtpPacketTest, CreateWith2Extensions) {
 TEST(RtpPacketTest, SetReservedExtensionsAfterPayload) {
   const size_t kPayloadSize = 4;
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
-  extensions.Register(kRtpExtensionAudioLevel, kAudioLevelExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
+  extensions.Register<AudioLevel>(kAudioLevelExtensionId);
   RtpPacketToSend packet(&extensions);
 
   EXPECT_TRUE(packet.ReserveExtension<TransmissionOffset>());
@@ -177,8 +174,7 @@ TEST(RtpPacketTest, ParseBuffer) {
 
 TEST(RtpPacketTest, ParseWithExtension) {
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
 
   RtpPacketReceived packet(&extensions);
   EXPECT_TRUE(packet.Parse(kPacketWithTO, sizeof(kPacketWithTO)));
@@ -195,9 +191,8 @@ TEST(RtpPacketTest, ParseWithExtension) {
 
 TEST(RtpPacketTest, ParseWith2Extensions) {
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
-  extensions.Register(kRtpExtensionAudioLevel, kAudioLevelExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
+  extensions.Register<AudioLevel>(kAudioLevelExtensionId);
   RtpPacketReceived packet(&extensions);
   EXPECT_TRUE(packet.Parse(kPacketWithTOAndAL, sizeof(kPacketWithTOAndAL)));
   int32_t time_offset;
@@ -212,8 +207,7 @@ TEST(RtpPacketTest, ParseWith2Extensions) {
 
 TEST(RtpPacketTest, ParseWithAllFeatures) {
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
   RtpPacketReceived packet(&extensions);
   EXPECT_TRUE(packet.Parse(kPacket, sizeof(kPacket)));
   EXPECT_EQ(kPayloadType, packet.PayloadType());
@@ -237,8 +231,7 @@ TEST(RtpPacketTest, ParseWithExtensionDelayed) {
   EXPECT_EQ(kSsrc, packet.Ssrc());
 
   RtpPacketToSend::ExtensionManager extensions;
-  extensions.Register(kRtpExtensionTransmissionTimeOffset,
-                      kTransmissionOffsetExtensionId);
+  extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
 
   int32_t time_offset;
   EXPECT_FALSE(packet.GetExtension<TransmissionOffset>(&time_offset));