Refactor rtcp statistics: Rtcp module take narrow interface

webrtc/modules/rtp_rtcp/source/rtcp_sender.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
index 9ab763ae40cdd30bce7be3e3f782fcbeada2a879..77e972486cb9bf91f51d4e6fc6a130c34e2181b3 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
@@ -77,7 +77,7 @@ class RTCPSender {
 
   RTCPSender(bool audio,
              Clock* clock,
-             ReceiveStatistics* receive_statistics,
+             ReceiveStatisticsReporter* receive_statistics,
              RtcpPacketTypeCounterObserver* packet_type_counter_observer,
              RtcEventLog* event_log,
              Transport* outgoing_transport);
@@ -157,11 +157,6 @@ class RTCPSender {
   void PrepareReport(const FeedbackState& feedback_state)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
-  bool AddReportBlock(const FeedbackState& feedback_state,
-                      uint32_t ssrc,
-                      StreamStatistician* statistician)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
-
   std::unique_ptr<rtcp::RtcpPacket> BuildSR(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildRR(const RtcpContext& context)
@@ -212,9 +207,9 @@ class RTCPSender {
   uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
   std::string cname_ GUARDED_BY(critical_section_rtcp_sender_);
 
-  ReceiveStatistics* receive_statistics_
+  ReceiveStatisticsReporter* receive_statistics_
       GUARDED_BY(critical_section_rtcp_sender_);
-  std::map<uint32_t, rtcp::ReportBlock> report_blocks_
+  std::vector<rtcp::ReportBlock> report_blocks_
       GUARDED_BY(critical_section_rtcp_sender_);
   std::map<uint32_t, std::string> csrc_cnames_
       GUARDED_BY(critical_section_rtcp_sender_);