Revert of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_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 21 matching lines @@
   Sdes parsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(0u, parsed.chunks().size());
 }
 
 TEST(RtcpPacketSdesTest, CreateAndParseWithOneChunk) {
   const std::string kCname = "alice@host";
 
   Sdes sdes;
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc, kCname));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc, kCname));
 
   rtc::Buffer packet = sdes.Build();
   Sdes sdes_parsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &sdes_parsed));
   const Sdes& parsed = sdes_parsed;  // Ensure accessors are const.
 
   EXPECT_EQ(1u, parsed.chunks().size());
   EXPECT_EQ(kSenderSsrc, parsed.chunks()[0].ssrc);
   EXPECT_EQ(kCname, parsed.chunks()[0].cname);
 }
 
 TEST(RtcpPacketSdesTest, CreateAndParseWithMultipleChunks) {
   Sdes sdes;
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 0, "a"));
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 1, "ab"));
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 2, "abc"));
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 3, "abcd"));
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 4, "abcde"));
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 5, "abcdef"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 0, "a"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 1, "ab"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 2, "abc"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 3, "abcd"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 4, "abcde"));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 5, "abcdef"));
 
   rtc::Buffer packet = sdes.Build();
   Sdes parsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(6u, parsed.chunks().size());
   EXPECT_EQ(kSenderSsrc + 5, parsed.chunks()[5].ssrc);
   EXPECT_EQ("abcdef", parsed.chunks()[5].cname);
 }
 
 TEST(RtcpPacketSdesTest, CreateWithTooManyChunks) {
   const size_t kMaxChunks = (1 << 5) - 1;
   Sdes sdes;
   for (size_t i = 0; i < kMaxChunks; ++i) {
     uint32_t ssrc = kSenderSsrc + i;
     std::ostringstream oss;
     oss << "cname" << i;
-    EXPECT_TRUE(sdes.AddCName(ssrc, oss.str()));
+    EXPECT_TRUE(sdes.WithCName(ssrc, oss.str()));
   }
-  EXPECT_FALSE(sdes.AddCName(kSenderSsrc + kMaxChunks, "foo"));
+  EXPECT_FALSE(sdes.WithCName(kSenderSsrc + kMaxChunks, "foo"));
 }
 
 TEST(RtcpPacketSdesTest, CreateAndParseCnameItemWithEmptyString) {
   Sdes sdes;
-  EXPECT_TRUE(sdes.AddCName(kSenderSsrc, ""));
+  EXPECT_TRUE(sdes.WithCName(kSenderSsrc, ""));
 
   rtc::Buffer packet = sdes.Build();
   Sdes parsed;
   EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
 
   EXPECT_EQ(1u, parsed.chunks().size());
   EXPECT_EQ(kSenderSsrc, parsed.chunks()[0].ssrc);
   EXPECT_EQ("", parsed.chunks()[0].cname);
 }
 
@@ skipping 120 matching lines @@
   ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);
 
   Sdes parsed;
   EXPECT_FALSE(test::ParseSinglePacket(kInvalidPacket, &parsed));
 }
 
 TEST(RtcpPacketSdesTest, ParsedSdesCanBeReusedForBuilding) {
   Sdes source;
   const std::string kAlice = "alice@host";
   const std::string kBob = "bob@host";
-  source.AddCName(kSenderSsrc, kAlice);
+  source.WithCName(kSenderSsrc, kAlice);
 
   rtc::Buffer packet1 = source.Build();
   Sdes middle;
   test::ParseSinglePacket(packet1, &middle);
 
   EXPECT_EQ(source.BlockLength(), middle.BlockLength());
 
-  middle.AddCName(kSenderSsrc + 1, kBob);
+  middle.WithCName(kSenderSsrc + 1, kBob);
 
   rtc::Buffer packet2 = middle.Build();
   Sdes destination;
   test::ParseSinglePacket(packet2, &destination);
 
   EXPECT_EQ(middle.BlockLength(), destination.BlockLength());
 
   EXPECT_EQ(2u, destination.chunks().size());
   EXPECT_EQ(kSenderSsrc, destination.chunks()[0].ssrc);
   EXPECT_EQ(kAlice, destination.chunks()[0].cname);
   EXPECT_EQ(kSenderSsrc + 1, destination.chunks()[1].ssrc);
   EXPECT_EQ(kBob, destination.chunks()[1].cname);
 }
 }  // namespace webrtc