Revert of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc

 /*
  *  Copyright (c) 2016 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 92 matching lines @@
 template <>
 NtpTime RtcpPacketExtendedReportsTest::Rand<NtpTime>() {
   uint32_t secs = Rand<uint32_t>();
   uint32_t frac = Rand<uint32_t>();
   return NtpTime(secs, frac);
 }
 
 template <>
 Rrtr RtcpPacketExtendedReportsTest::Rand<Rrtr>() {
   Rrtr rrtr;
-  rrtr.SetNtp(Rand<NtpTime>());
+  rrtr.WithNtp(Rand<NtpTime>());
   return rrtr;
 }
 
 template <>
 RTCPVoIPMetric RtcpPacketExtendedReportsTest::Rand<RTCPVoIPMetric>() {
   RTCPVoIPMetric metric;
   metric.lossRate       = Rand<uint8_t>();
   metric.discardRate    = Rand<uint8_t>();
   metric.burstDensity   = Rand<uint8_t>();
   metric.gapDensity     = Rand<uint8_t>();
@@ skipping 12 matching lines @@
   metric.RXconfig       = Rand<uint8_t>();
   metric.JBnominal      = Rand<uint16_t>();
   metric.JBmax          = Rand<uint16_t>();
   metric.JBabsMax       = Rand<uint16_t>();
   return metric;
 }
 
 template <>
 VoipMetric RtcpPacketExtendedReportsTest::Rand<VoipMetric>() {
   VoipMetric voip_metric;
-  voip_metric.SetMediaSsrc(Rand<uint32_t>());
-  voip_metric.SetVoipMetric(Rand<RTCPVoIPMetric>());
+  voip_metric.To(Rand<uint32_t>());
+  voip_metric.WithVoipMetric(Rand<RTCPVoIPMetric>());
   return voip_metric;
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateWithoutReportBlocks) {
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
+  xr.From(kSenderSsrc);
 
   rtc::Buffer packet = xr.Build();
 
   EXPECT_THAT(make_tuple(packet.data(), packet.size()),
               ElementsAreArray(kEmptyPacket));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, ParseWithoutReportBlocks) {
   ExtendedReports parsed;
   EXPECT_TRUE(test::ParseSinglePacket(kEmptyPacket, &parsed));
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.rrtrs(), IsEmpty());
   EXPECT_THAT(parsed.dlrrs(), IsEmpty());
   EXPECT_THAT(parsed.voip_metrics(), IsEmpty());
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithOneRrtrBlock) {
   Rrtr rrtr = Rand<Rrtr>();
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddRrtr(rrtr));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithRrtr(rrtr));
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.rrtrs(), ElementsAre(rrtr));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithTwoRrtrBlocks) {
   Rrtr rrtr1 = Rand<Rrtr>();
   Rrtr rrtr2 = Rand<Rrtr>();
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddRrtr(rrtr1));
-  EXPECT_TRUE(xr.AddRrtr(rrtr2));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithRrtr(rrtr1));
+  EXPECT_TRUE(xr.WithRrtr(rrtr2));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.rrtrs(), ElementsAre(rrtr1, rrtr2));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithDlrrWithOneSubBlock) {
   Dlrr dlrr;
-  EXPECT_TRUE(dlrr.AddDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr.WithDlrrItem(Rand<ReceiveTimeInfo>()));
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddDlrr(dlrr));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithDlrr(dlrr));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.dlrrs(), ElementsAre(dlrr));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithDlrrWithTwoSubBlocks) {
   Dlrr dlrr;
-  EXPECT_TRUE(dlrr.AddDlrrItem(Rand<ReceiveTimeInfo>()));
-  EXPECT_TRUE(dlrr.AddDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr.WithDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr.WithDlrrItem(Rand<ReceiveTimeInfo>()));
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddDlrr(dlrr));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithDlrr(dlrr));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.dlrrs(), ElementsAre(dlrr));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithTwoDlrrBlocks) {
   Dlrr dlrr1;
-  EXPECT_TRUE(dlrr1.AddDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr1.WithDlrrItem(Rand<ReceiveTimeInfo>()));
   Dlrr dlrr2;
-  EXPECT_TRUE(dlrr2.AddDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr2.WithDlrrItem(Rand<ReceiveTimeInfo>()));
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddDlrr(dlrr1));
-  EXPECT_TRUE(xr.AddDlrr(dlrr2));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithDlrr(dlrr1));
+  EXPECT_TRUE(xr.WithDlrr(dlrr2));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.dlrrs(), ElementsAre(dlrr1, dlrr2));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithVoipMetric) {
   VoipMetric voip_metric = Rand<VoipMetric>();
 
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddVoipMetric(voip_metric));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithVoipMetric(voip_metric));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.voip_metrics(), ElementsAre(voip_metric));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, CreateAndParseWithMultipleReportBlocks) {
   Rrtr rrtr = Rand<Rrtr>();
   Dlrr dlrr;
-  EXPECT_TRUE(dlrr.AddDlrrItem(Rand<ReceiveTimeInfo>()));
+  EXPECT_TRUE(dlrr.WithDlrrItem(Rand<ReceiveTimeInfo>()));
   VoipMetric metric = Rand<VoipMetric>();
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddRrtr(rrtr));
-  EXPECT_TRUE(xr.AddDlrr(dlrr));
-  EXPECT_TRUE(xr.AddVoipMetric(metric));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithRrtr(rrtr));
+  EXPECT_TRUE(xr.WithDlrr(dlrr));
+  EXPECT_TRUE(xr.WithVoipMetric(metric));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.rrtrs(), ElementsAre(rrtr));
   EXPECT_THAT(parsed.dlrrs(), ElementsAre(dlrr));
   EXPECT_THAT(parsed.voip_metrics(), ElementsAre(metric));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, DlrrWithoutItemNotIncludedInPacket) {
   Rrtr rrtr = Rand<Rrtr>();
   Dlrr dlrr;
   VoipMetric metric = Rand<VoipMetric>();
   ExtendedReports xr;
-  xr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(xr.AddRrtr(rrtr));
-  EXPECT_TRUE(xr.AddDlrr(dlrr));
-  EXPECT_TRUE(xr.AddVoipMetric(metric));
+  xr.From(kSenderSsrc);
+  EXPECT_TRUE(xr.WithRrtr(rrtr));
+  EXPECT_TRUE(xr.WithDlrr(dlrr));
+  EXPECT_TRUE(xr.WithVoipMetric(metric));
 
   rtc::Buffer packet = xr.Build();
 
   ExtendedReports mparsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
   const ExtendedReports& parsed = mparsed;
 
   EXPECT_THAT(parsed.rrtrs(), ElementsAre(rrtr));
   EXPECT_THAT(parsed.dlrrs(), IsEmpty());
   EXPECT_THAT(parsed.voip_metrics(), ElementsAre(metric));
 }
 
 TEST_F(RtcpPacketExtendedReportsTest, WithTooManyBlocks) {
   const size_t kMaxBlocks = 50;
   ExtendedReports xr;
 
   Rrtr rrtr = Rand<Rrtr>();
   for (size_t i = 0; i < kMaxBlocks; ++i)
-    EXPECT_TRUE(xr.AddRrtr(rrtr));
-  EXPECT_FALSE(xr.AddRrtr(rrtr));
+    EXPECT_TRUE(xr.WithRrtr(rrtr));
+  EXPECT_FALSE(xr.WithRrtr(rrtr));
 
   Dlrr dlrr;
   for (size_t i = 0; i < kMaxBlocks; ++i)
-    EXPECT_TRUE(xr.AddDlrr(dlrr));
-  EXPECT_FALSE(xr.AddDlrr(dlrr));
+    EXPECT_TRUE(xr.WithDlrr(dlrr));
+  EXPECT_FALSE(xr.WithDlrr(dlrr));
 
   VoipMetric voip_metric = Rand<VoipMetric>();
   for (size_t i = 0; i < kMaxBlocks; ++i)
-    EXPECT_TRUE(xr.AddVoipMetric(voip_metric));
-  EXPECT_FALSE(xr.AddVoipMetric(voip_metric));
+    EXPECT_TRUE(xr.WithVoipMetric(voip_metric));
+  EXPECT_FALSE(xr.WithVoipMetric(voip_metric));
 }
 }  // namespace webrtc