Reland of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_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 17 matching lines @@
 }  // namespace
 
 TEST(RtcpPacketDlrrTest, Empty) {
   Dlrr dlrr;
 
   EXPECT_EQ(0u, dlrr.BlockLength());
 }
 
 TEST(RtcpPacketDlrrTest, Create) {
   Dlrr dlrr;
-  EXPECT_TRUE(dlrr.WithDlrrItem(kSsrc, kLastRR, kDelay));
+  EXPECT_TRUE(dlrr.AddDlrrItem(kSsrc, kLastRR, kDelay));
 
   ASSERT_EQ(kBlockSizeBytes, dlrr.BlockLength());
   uint8_t buffer[kBlockSizeBytes];
 
   dlrr.Create(buffer);
   EXPECT_EQ(0, memcmp(buffer, kBlock, kBlockSizeBytes));
 }
 
 TEST(RtcpPacketDlrrTest, Parse) {
   Dlrr dlrr;
@@ skipping 17 matching lines @@
     buffer[3] = size;
     Dlrr dlrr;
     // Parse should be successful only when size is multiple of 3.
     EXPECT_EQ(size % 3 == 0, dlrr.Parse(buffer, static_cast<uint16_t>(size)));
   }
 }
 
 TEST(RtcpPacketDlrrTest, FailsOnTooManySubBlocks) {
   Dlrr dlrr;
   for (size_t i = 1; i <= Dlrr::kMaxNumberOfDlrrItems; ++i) {
-    EXPECT_TRUE(dlrr.WithDlrrItem(kSsrc + i, kLastRR + i, kDelay + i));
+    EXPECT_TRUE(dlrr.AddDlrrItem(kSsrc + i, kLastRR + i, kDelay + i));
   }
-  EXPECT_FALSE(dlrr.WithDlrrItem(kSsrc, kLastRR, kDelay));
+  EXPECT_FALSE(dlrr.AddDlrrItem(kSsrc, kLastRR, kDelay));
 }
 
 TEST(RtcpPacketDlrrTest, CreateAndParseMaxSubBlocks) {
   const size_t kBufferSize = 0x1000;  // More than enough.
   uint8_t buffer[kBufferSize];
 
   // Create.
   Dlrr dlrr;
   for (size_t i = 1; i <= Dlrr::kMaxNumberOfDlrrItems; ++i) {
-    EXPECT_TRUE(dlrr.WithDlrrItem(kSsrc + i, kLastRR + i, kDelay + i));
+    EXPECT_TRUE(dlrr.AddDlrrItem(kSsrc + i, kLastRR + i, kDelay + i));
   }
   size_t used_buffer_size = dlrr.BlockLength();
   ASSERT_LE(used_buffer_size, kBufferSize);
   dlrr.Create(buffer);
 
   // Parse.
   Dlrr parsed;
   uint16_t block_length = ByteReader<uint16_t>::ReadBigEndian(&buffer[2]);
   EXPECT_EQ(used_buffer_size, (block_length + 1) * 4u);
   EXPECT_TRUE(parsed.Parse(buffer, block_length));
   EXPECT_TRUE(parsed.sub_blocks().size() == Dlrr::kMaxNumberOfDlrrItems);
 }
 }  // namespace webrtc