Reland of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_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 21 matching lines @@
                            0x12, 0x34, 0x56, 0x78,
                            0x11, 0x12, 0x14, 0x18,
                            0x22, 0x24, 0x26, 0x28,
                            0x33, 0x34, 0x35, 0x36,
                            0x44, 0x45, 0x46, 0x47,
                            0x55, 0x56, 0x57, 0x58};
 }  // namespace
 
 TEST(RtcpPacketSenderReportTest, CreateWithoutReportBlocks) {
   SenderReport sr;
-  sr.From(kSenderSsrc);
-  sr.WithNtp(kNtp);
-  sr.WithRtpTimestamp(kRtpTimestamp);
-  sr.WithPacketCount(kPacketCount);
-  sr.WithOctetCount(kOctetCount);
+  sr.SetSenderSsrc(kSenderSsrc);
+  sr.SetNtp(kNtp);
+  sr.SetRtpTimestamp(kRtpTimestamp);
+  sr.SetPacketCount(kPacketCount);
+  sr.SetOctetCount(kOctetCount);
 
   rtc::Buffer raw = sr.Build();
   EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket));
 }
 
 TEST(RtcpPacketSenderReportTest, ParseWithoutReportBlocks) {
   SenderReport parsed;
   EXPECT_TRUE(test::ParseSinglePacket(kPacket, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(kNtp, parsed.ntp());
   EXPECT_EQ(kRtpTimestamp, parsed.rtp_timestamp());
   EXPECT_EQ(kPacketCount, parsed.sender_packet_count());
   EXPECT_EQ(kOctetCount, parsed.sender_octet_count());
   EXPECT_TRUE(parsed.report_blocks().empty());
 }
 
 TEST(RtcpPacketSenderReportTest, CreateAndParseWithOneReportBlock) {
   ReportBlock rb;
-  rb.To(kRemoteSsrc);
+  rb.SetMediaSsrc(kRemoteSsrc);
 
   SenderReport sr;
-  sr.From(kSenderSsrc);
-  EXPECT_TRUE(sr.WithReportBlock(rb));
+  sr.SetSenderSsrc(kSenderSsrc);
+  EXPECT_TRUE(sr.AddReportBlock(rb));
 
   rtc::Buffer raw = sr.Build();
   SenderReport parsed;
   EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(1u, parsed.report_blocks().size());
   EXPECT_EQ(kRemoteSsrc, parsed.report_blocks()[0].source_ssrc());
 }
 
 TEST(RtcpPacketSenderReportTest, CreateAndParseWithTwoReportBlocks) {
   ReportBlock rb1;
-  rb1.To(kRemoteSsrc);
+  rb1.SetMediaSsrc(kRemoteSsrc);
   ReportBlock rb2;
-  rb2.To(kRemoteSsrc + 1);
+  rb2.SetMediaSsrc(kRemoteSsrc + 1);
 
   SenderReport sr;
-  sr.From(kSenderSsrc);
-  EXPECT_TRUE(sr.WithReportBlock(rb1));
-  EXPECT_TRUE(sr.WithReportBlock(rb2));
+  sr.SetSenderSsrc(kSenderSsrc);
+  EXPECT_TRUE(sr.AddReportBlock(rb1));
+  EXPECT_TRUE(sr.AddReportBlock(rb2));
 
   rtc::Buffer raw = sr.Build();
   SenderReport parsed;
   EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_EQ(2u, parsed.report_blocks().size());
   EXPECT_EQ(kRemoteSsrc, parsed.report_blocks()[0].source_ssrc());
   EXPECT_EQ(kRemoteSsrc + 1, parsed.report_blocks()[1].source_ssrc());
 }
 
 TEST(RtcpPacketSenderReportTest, CreateWithTooManyReportBlocks) {
   SenderReport sr;
-  sr.From(kSenderSsrc);
+  sr.SetSenderSsrc(kSenderSsrc);
   const size_t kMaxReportBlocks = (1 << 5) - 1;
   ReportBlock rb;
   for (size_t i = 0; i < kMaxReportBlocks; ++i) {
-    rb.To(kRemoteSsrc + i);
-    EXPECT_TRUE(sr.WithReportBlock(rb));
+    rb.SetMediaSsrc(kRemoteSsrc + i);
+    EXPECT_TRUE(sr.AddReportBlock(rb));
   }
-  rb.To(kRemoteSsrc + kMaxReportBlocks);
-  EXPECT_FALSE(sr.WithReportBlock(rb));
+  rb.SetMediaSsrc(kRemoteSsrc + kMaxReportBlocks);
+  EXPECT_FALSE(sr.AddReportBlock(rb));
 }
 
 }  // namespace webrtc