[rtp_rtcp] rtcp::Xr moved into own file and renamed to ExtendedReports on the way

webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index 5d2fda347e9d45e0a84876cd0eb79f426d181215..1f153c28e5a1949bc53b4607fc74d2593be55169 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -23,6 +23,7 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h"
@@ -575,15 +576,15 @@ TEST_F(RtcpReceiverTest, InjectSliPacket) {
   EXPECT_EQ(40, rtcp_packet_info_.sliPictureId);
 }
 
-TEST_F(RtcpReceiverTest, XrPacketWithZeroReportBlocksIgnored) {
-  rtcp::Xr xr;
+TEST_F(RtcpReceiverTest, ExtendedReportsPacketWithZeroReportBlocksIgnored) {
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
   EXPECT_EQ(0, InjectRtcpPacket(packet->Buffer(), packet->Length()));
   EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrVoipPacket) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsVoipPacket) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -595,7 +596,7 @@ TEST_F(RtcpReceiverTest, InjectXrVoipPacket) {
   RTCPVoIPMetric metric;
   metric.lossRate = kLossRate;
   voip_metric.WithVoipMetric(metric);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithVoipMetric(&voip_metric);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
@@ -605,7 +606,7 @@ TEST_F(RtcpReceiverTest, InjectXrVoipPacket) {
   EXPECT_EQ(kRtcpXrVoipMetric, rtcp_packet_info_.rtcpPacketTypeFlags);
 }
 
-TEST_F(RtcpReceiverTest, XrVoipPacketNotToUsIgnored) {
+TEST_F(RtcpReceiverTest, ExtendedReportsVoipPacketNotToUsIgnored) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -613,7 +614,7 @@ TEST_F(RtcpReceiverTest, XrVoipPacketNotToUsIgnored) {
 
   rtcp::VoipMetric voip_metric;
   voip_metric.To(kSourceSsrc + 1);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithVoipMetric(&voip_metric);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
@@ -621,10 +622,10 @@ TEST_F(RtcpReceiverTest, XrVoipPacketNotToUsIgnored) {
   EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrReceiverReferenceTimePacket) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsReceiverReferenceTimePacket) {
   rtcp::Rrtr rrtr;
   rrtr.WithNtp(NtpTime(0x10203, 0x40506));
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithRrtr(&rrtr);
 
@@ -634,7 +635,7 @@ TEST_F(RtcpReceiverTest, InjectXrReceiverReferenceTimePacket) {
             rtcp_packet_info_.rtcpPacketTypeFlags);
 }
 
-TEST_F(RtcpReceiverTest, XrDlrrPacketNotToUsIgnored) {
+TEST_F(RtcpReceiverTest, ExtendedReportsDlrrPacketNotToUsIgnored) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -642,7 +643,7 @@ TEST_F(RtcpReceiverTest, XrDlrrPacketNotToUsIgnored) {
 
   rtcp::Dlrr dlrr;
   dlrr.WithDlrrItem(kSourceSsrc + 1, 0x12345, 0x67890);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithDlrr(&dlrr);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
@@ -651,7 +652,7 @@ TEST_F(RtcpReceiverTest, XrDlrrPacketNotToUsIgnored) {
   EXPECT_FALSE(rtcp_packet_info_.xr_dlrr_item);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithSubBlock) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithSubBlock) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -659,7 +660,7 @@ TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithSubBlock) {
 
   rtcp::Dlrr dlrr;
   dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithDlrr(&dlrr);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
@@ -669,7 +670,7 @@ TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithSubBlock) {
   EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithMultipleSubBlocks) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithMultipleSubBlocks) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -679,7 +680,7 @@ TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithMultipleSubBlocks) {
   dlrr.WithDlrrItem(kSourceSsrc + 1, 0x12345, 0x67890);
   dlrr.WithDlrrItem(kSourceSsrc + 2, 0x12345, 0x67890);
   dlrr.WithDlrrItem(kSourceSsrc,     0x12345, 0x67890);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithDlrr(&dlrr);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());
@@ -689,7 +690,7 @@ TEST_F(RtcpReceiverTest, InjectXrDlrrPacketWithMultipleSubBlocks) {
   EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrPacketWithMultipleReportBlocks) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithMultipleReportBlocks) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -700,7 +701,7 @@ TEST_F(RtcpReceiverTest, InjectXrPacketWithMultipleReportBlocks) {
   dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
   rtcp::VoipMetric metric;
   metric.To(kSourceSsrc);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithRrtr(&rrtr);
   xr.WithDlrr(&dlrr);
@@ -715,7 +716,7 @@ TEST_F(RtcpReceiverTest, InjectXrPacketWithMultipleReportBlocks) {
   EXPECT_TRUE(rtcp_packet_info_.xr_dlrr_item);
 }
 
-TEST_F(RtcpReceiverTest, InjectXrPacketWithUnknownReportBlock) {
+TEST_F(RtcpReceiverTest, InjectExtendedReportsPacketWithUnknownReportBlock) {
   const uint32_t kSourceSsrc = 0x123456;
   std::set<uint32_t> ssrcs;
   ssrcs.insert(kSourceSsrc);
@@ -728,7 +729,7 @@ TEST_F(RtcpReceiverTest, InjectXrPacketWithUnknownReportBlock) {
   dlrr.WithDlrrItem(kSourceSsrc, 0x12345, 0x67890);
   rtcp::VoipMetric metric;
   metric.To(kSourceSsrc);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(0x2345);
   xr.WithRrtr(&rrtr);
   xr.WithDlrr(&dlrr);
@@ -756,7 +757,7 @@ TEST_F(RtcpReceiverTest, LastReceivedXrReferenceTimeInfoInitiallyFalse) {
   EXPECT_FALSE(rtcp_receiver_->LastReceivedXrReferenceTimeInfo(&info));
 }
 
-TEST_F(RtcpReceiverTest, GetLastReceivedXrReferenceTimeInfo) {
+TEST_F(RtcpReceiverTest, GetLastReceivedExtendedReportsReferenceTimeInfo) {
   const uint32_t kSenderSsrc = 0x123456;
   const NtpTime kNtp(0x10203, 0x40506);
   const uint32_t kNtpMid =
@@ -764,7 +765,7 @@ TEST_F(RtcpReceiverTest, GetLastReceivedXrReferenceTimeInfo) {
 
   rtcp::Rrtr rrtr;
   rrtr.WithNtp(kNtp);
-  rtcp::Xr xr;
+  rtcp::ExtendedReports xr;
   xr.From(kSenderSsrc);
   xr.WithRrtr(&rrtr);
   rtc::scoped_ptr<rtcp::RawPacket> packet(xr.Build());