Reland of Unify rtcp packet setters

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
index ac7fbcaa640f05e26b1790c9f6545befa7d966fd..6611991fbc65551058a4e20596e11fc239a46b7b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
@@ -39,11 +39,11 @@ const uint8_t kPacket[] = {0x80,  200, 0x00, 0x06,
 
 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));
@@ -63,11 +63,11 @@ TEST(RtcpPacketSenderReportTest, ParseWithoutReportBlocks) {
 
 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;
@@ -80,14 +80,14 @@ TEST(RtcpPacketSenderReportTest, CreateAndParseWithOneReportBlock) {
 
 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;
@@ -101,15 +101,15 @@ TEST(RtcpPacketSenderReportTest, CreateAndParseWithTwoReportBlocks) {
 
 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