Reland of Unify rtcp packet setters

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

 /*
  *  Copyright (c) 2015 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 47 matching lines @@
 
 TEST(RtcpPacketReceiverReportTest, ParseFailsOnIncorrectSize) {
   rtc::Buffer damaged_packet(kPacket);
   damaged_packet[0]++;  // Damage the packet: increase count field.
   ReceiverReport rr;
   EXPECT_FALSE(test::ParseSinglePacket(damaged_packet, &rr));
 }
 
 TEST(RtcpPacketReceiverReportTest, CreateWithOneReportBlock) {
   ReceiverReport rr;
-  rr.From(kSenderSsrc);
+  rr.SetSenderSsrc(kSenderSsrc);
   ReportBlock rb;
-  rb.To(kRemoteSsrc);
-  rb.WithFractionLost(kFractionLost);
-  rb.WithCumulativeLost(kCumulativeLost);
-  rb.WithExtHighestSeqNum(kExtHighestSeqNum);
-  rb.WithJitter(kJitter);
-  rb.WithLastSr(kLastSr);
-  rb.WithDelayLastSr(kDelayLastSr);
-  rr.WithReportBlock(rb);
+  rb.SetMediaSsrc(kRemoteSsrc);
+  rb.SetFractionLost(kFractionLost);
+  rb.SetCumulativeLost(kCumulativeLost);
+  rb.SetExtHighestSeqNum(kExtHighestSeqNum);
+  rb.SetJitter(kJitter);
+  rb.SetLastSr(kLastSr);
+  rb.SetDelayLastSr(kDelayLastSr);
+  rr.AddReportBlock(rb);
 
   rtc::Buffer raw = rr.Build();
 
   EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket));
 }
 
 TEST(RtcpPacketReceiverReportTest, CreateAndParseWithoutReportBlocks) {
   ReceiverReport rr;
-  rr.From(kSenderSsrc);
+  rr.SetSenderSsrc(kSenderSsrc);
 
   rtc::Buffer raw = rr.Build();
   ReceiverReport parsed;
   EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.report_blocks(), IsEmpty());
 }
 
 TEST(RtcpPacketReceiverReportTest, CreateAndParseWithTwoReportBlocks) {
   ReceiverReport rr;
   ReportBlock rb1;
-  rb1.To(kRemoteSsrc);
+  rb1.SetMediaSsrc(kRemoteSsrc);
   ReportBlock rb2;
-  rb2.To(kRemoteSsrc + 1);
+  rb2.SetMediaSsrc(kRemoteSsrc + 1);
 
-  rr.From(kSenderSsrc);
-  EXPECT_TRUE(rr.WithReportBlock(rb1));
-  EXPECT_TRUE(rr.WithReportBlock(rb2));
+  rr.SetSenderSsrc(kSenderSsrc);
+  EXPECT_TRUE(rr.AddReportBlock(rb1));
+  EXPECT_TRUE(rr.AddReportBlock(rb2));
 
   rtc::Buffer raw = rr.Build();
   ReceiverReport 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(RtcpPacketReceiverReportTest, CreateWithTooManyReportBlocks) {
   ReceiverReport rr;
-  rr.From(kSenderSsrc);
+  rr.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(rr.WithReportBlock(rb));
+    rb.SetMediaSsrc(kRemoteSsrc + i);
+    EXPECT_TRUE(rr.AddReportBlock(rb));
   }
-  rb.To(kRemoteSsrc + kMaxReportBlocks);
-  EXPECT_FALSE(rr.WithReportBlock(rb));
+  rb.SetMediaSsrc(kRemoteSsrc + kMaxReportBlocks);
+  EXPECT_FALSE(rr.AddReportBlock(rb));
 }
 
 }  // namespace webrtc