Revert of Unify rtcp packet setters

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
index 5e2c7df77df8be8011c3a69905b11fe3762a2008..94686fb27571606a9cd7946bad9109f683c24d0b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
@@ -35,11 +35,11 @@
 TEST(RtcpCompoundPacketTest, AppendPacket) {
   CompoundPacket compound;
   Fir fir;
-  fir.AddRequestTo(kRemoteSsrc, kSeqNo);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   ReportBlock rb;
   ReceiverReport rr;
-  rr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(rr.AddReportBlock(rb));
+  rr.From(kSenderSsrc);
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   compound.Append(&rr);
   compound.Append(&fir);
 
@@ -56,12 +56,12 @@
   CompoundPacket root;
   CompoundPacket leaf;
   Fir fir;
-  fir.AddRequestTo(kRemoteSsrc, kSeqNo);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   Bye bye;
   ReportBlock rb;
 
   ReceiverReport rr;
-  EXPECT_TRUE(rr.AddReportBlock(rb));
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   leaf.Append(&rr);
   leaf.Append(&fir);
 
@@ -83,11 +83,11 @@
 TEST(RtcpCompoundPacketTest, BuildWithInputBuffer) {
   CompoundPacket compound;
   Fir fir;
-  fir.AddRequestTo(kRemoteSsrc, kSeqNo);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   ReportBlock rb;
   ReceiverReport rr;
-  rr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(rr.AddReportBlock(rb));
+  rr.From(kSenderSsrc);
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   compound.Append(&rr);
   compound.Append(&fir);
 
@@ -117,11 +117,11 @@
 TEST(RtcpCompoundPacketTest, BuildWithTooSmallBuffer_FragmentedSend) {
   CompoundPacket compound;
   Fir fir;
-  fir.AddRequestTo(kRemoteSsrc, kSeqNo);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   ReportBlock rb;
   ReceiverReport rr;
-  rr.SetSenderSsrc(kSenderSsrc);
-  EXPECT_TRUE(rr.AddReportBlock(rb));
+  rr.From(kSenderSsrc);
+  EXPECT_TRUE(rr.WithReportBlock(rb));
   compound.Append(&rr);
   compound.Append(&fir);