Revert of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_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 31 matching lines @@
   const Fir& parsed = mutable_parsed;  // Read values from constant object.
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.requests(),
               ElementsAre(AllOf(Field(&Fir::Request::ssrc, Eq(kRemoteSsrc)),
                                 Field(&Fir::Request::seq_nr, Eq(kSeqNr)))));
 }
 
 TEST(RtcpPacketFirTest, Create) {
   Fir fir;
-  fir.SetSenderSsrc(kSenderSsrc);
-  fir.AddRequestTo(kRemoteSsrc, kSeqNr);
+  fir.From(kSenderSsrc);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNr);
 
   rtc::Buffer packet = fir.Build();
 
   EXPECT_THAT(make_tuple(packet.data(), packet.size()),
               ElementsAreArray(kPacket));
 }
 
 TEST(RtcpPacketFirTest, TwoFciEntries) {
   Fir fir;
-  fir.SetSenderSsrc(kSenderSsrc);
-  fir.AddRequestTo(kRemoteSsrc, kSeqNr);
-  fir.AddRequestTo(kRemoteSsrc + 1, kSeqNr + 1);
+  fir.From(kSenderSsrc);
+  fir.WithRequestTo(kRemoteSsrc, kSeqNr);
+  fir.WithRequestTo(kRemoteSsrc + 1, kSeqNr + 1);
 
   rtc::Buffer packet = fir.Build();
   Fir parsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
   EXPECT_THAT(parsed.requests(),
               ElementsAre(AllOf(Field(&Fir::Request::ssrc, Eq(kRemoteSsrc)),
                                 Field(&Fir::Request::seq_nr, Eq(kSeqNr))),
                           AllOf(Field(&Fir::Request::ssrc, Eq(kRemoteSsrc + 1)),
@@ skipping 14 matching lines @@
                                                   0x00, 0x00, 0x00, 0x00,
                                                   0x23, 0x45, 0x67, 0x89,
                                                   0x0d, 0x00, 0x00, 0x00,
                                                    'h',  'a',  'l',  'f'};
 
   Fir parsed;
   EXPECT_FALSE(test::ParseSinglePacket(kPacketWithOneAndHalfFci, &parsed));
 }
 
 }  // namespace webrtc