Reland of Unify rtcp packet setters

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
index d504143f6f6c5be3b0d0dd464457b047ed27e925..af4c5b42c5a4515ab5a70ab24ab5fb6c4098800a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
@@ -34,11 +34,10 @@ const size_t kPacketLength = sizeof(kPacket);
 
 TEST(RtcpPacketRembTest, Create) {
   Remb remb;
-  remb.From(kSenderSsrc);
-  remb.AppliesTo(kRemoteSsrcs[0]);
-  remb.AppliesTo(kRemoteSsrcs[1]);
-  remb.AppliesTo(kRemoteSsrcs[2]);
-  remb.WithBitrateBps(kBitrateBps);
+  remb.SetSenderSsrc(kSenderSsrc);
+  remb.SetSsrcs(
+      std::vector<uint32_t>(std::begin(kRemoteSsrcs), std::end(kRemoteSsrcs)));
+  remb.SetBitrateBps(kBitrateBps);
 
   rtc::Buffer packet = remb.Build();
 
@@ -58,8 +57,8 @@ TEST(RtcpPacketRembTest, Parse) {
 
 TEST(RtcpPacketRembTest, CreateAndParseWithoutSsrcs) {
   Remb remb;
-  remb.From(kSenderSsrc);
-  remb.WithBitrateBps(kBitrateBps);
+  remb.SetSenderSsrc(kSenderSsrc);
+  remb.SetBitrateBps(kBitrateBps);
   rtc::Buffer packet = remb.Build();
 
   Remb parsed;
@@ -71,7 +70,7 @@ TEST(RtcpPacketRembTest, CreateAndParseWithoutSsrcs) {
 
 TEST(RtcpPacketRembTest, CreateAndParse64bitBitrate) {
   Remb remb;
-  remb.WithBitrateBps(kBitrateBps64bit);
+  remb.SetBitrateBps(kBitrateBps64bit);
   rtc::Buffer packet = remb.Build();
 
   Remb parsed;
@@ -119,27 +118,11 @@ TEST(RtcpPacketRembTest, ParseFailsWhenSsrcCountMismatchLength) {
 }
 
 TEST(RtcpPacketRembTest, TooManySsrcs) {
-  const size_t kMax = 0xff;
   Remb remb;
-  for (size_t i = 1; i <= kMax; ++i)
-    EXPECT_TRUE(remb.AppliesTo(kRemoteSsrcs[0] + i));
-  EXPECT_FALSE(remb.AppliesTo(kRemoteSsrcs[0]));
-}
-
-TEST(RtcpPacketRembTest, TooManySsrcsForBatchAssign) {
-  const uint32_t kRemoteSsrc = kRemoteSsrcs[0];
-  const size_t kMax = 0xff;
-  const std::vector<uint32_t> kAllButOneSsrc(kMax - 1, kRemoteSsrc);
-  const std::vector<uint32_t> kTwoSsrcs(2, kRemoteSsrc);
-
-  Remb remb;
-  EXPECT_TRUE(remb.AppliesToMany(kAllButOneSsrc));
-  // Should be no place for 2 more.
-  EXPECT_FALSE(remb.AppliesToMany(kTwoSsrcs));
-  // But enough place for 1 more.
-  EXPECT_TRUE(remb.AppliesTo(kRemoteSsrc));
-  // But not for another one.
-  EXPECT_FALSE(remb.AppliesTo(kRemoteSsrc));
+  EXPECT_FALSE(remb.SetSsrcs(
+      std::vector<uint32_t>(Remb::kMaxNumberOfSsrcs + 1, kRemoteSsrcs[0])));
+  EXPECT_TRUE(remb.SetSsrcs(
+      std::vector<uint32_t>(Remb::kMaxNumberOfSsrcs, kRemoteSsrcs[0])));
 }
 
 }  // namespace webrtc