Test RtcpParser rewritten to use rtcp packet classes

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
index f341bad9df073c27b8e4a0341f9aaa3572ab710c..94686fb27571606a9cd7946bad9109f683c24d0b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
@@ -47,8 +47,8 @@ TEST(RtcpCompoundPacketTest, AppendPacket) {
   RtcpPacketParser parser;
   parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
-  EXPECT_EQ(kSenderSsrc, parser.receiver_report()->Ssrc());
-  EXPECT_EQ(1, parser.report_block()->num_packets());
+  EXPECT_EQ(kSenderSsrc, parser.receiver_report()->sender_ssrc());
+  EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
 
@@ -75,7 +75,7 @@ TEST(RtcpCompoundPacketTest, AppendPacketWithOwnAppendedPacket) {
   parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.sender_report()->num_packets());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
-  EXPECT_EQ(1, parser.report_block()->num_packets());
+  EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
   EXPECT_EQ(1, parser.bye()->num_packets());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
@@ -101,7 +101,7 @@ TEST(RtcpCompoundPacketTest, BuildWithInputBuffer) {
       RtcpPacketParser parser;
       parser.Parse(data, length);
       EXPECT_EQ(1, parser.receiver_report()->num_packets());
-      EXPECT_EQ(1, parser.report_block()->num_packets());
+      EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
       EXPECT_EQ(1, parser.fir()->num_packets());
       ++packets_created_;
     }
@@ -136,12 +136,12 @@ TEST(RtcpCompoundPacketTest, BuildWithTooSmallBuffer_FragmentedSend) {
       switch (packets_created_++) {
         case 0:
           EXPECT_EQ(1, parser.receiver_report()->num_packets());
-          EXPECT_EQ(1, parser.report_block()->num_packets());
+          EXPECT_EQ(1U, parser.receiver_report()->report_blocks().size());
           EXPECT_EQ(0, parser.fir()->num_packets());
           break;
         case 1:
           EXPECT_EQ(0, parser.receiver_report()->num_packets());
-          EXPECT_EQ(0, parser.report_block()->num_packets());
+          EXPECT_EQ(0U, parser.receiver_report()->report_blocks().size());
           EXPECT_EQ(1, parser.fir()->num_packets());
           break;
         default: