Reland of Unify rtcp packet setters

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
index 8c48a83a7fe43077113803b37e567b8b551d61dd..bce5f95b75bd549ad48f30a791d15dc084450eec 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
@@ -49,8 +49,8 @@ TEST(RtcpPacketFirTest, Parse) {
 
 TEST(RtcpPacketFirTest, Create) {
   Fir fir;
-  fir.From(kSenderSsrc);
-  fir.WithRequestTo(kRemoteSsrc, kSeqNr);
+  fir.SetSenderSsrc(kSenderSsrc);
+  fir.AddRequestTo(kRemoteSsrc, kSeqNr);
 
   rtc::Buffer packet = fir.Build();
 
@@ -60,9 +60,9 @@ TEST(RtcpPacketFirTest, Create) {
 
 TEST(RtcpPacketFirTest, TwoFciEntries) {
   Fir fir;
-  fir.From(kSenderSsrc);
-  fir.WithRequestTo(kRemoteSsrc, kSeqNr);
-  fir.WithRequestTo(kRemoteSsrc + 1, kSeqNr + 1);
+  fir.SetSenderSsrc(kSenderSsrc);
+  fir.AddRequestTo(kRemoteSsrc, kSeqNr);
+  fir.AddRequestTo(kRemoteSsrc + 1, kSeqNr + 1);
 
   rtc::Buffer packet = fir.Build();
   Fir parsed;