[rtp_rtcp] ReportBlockInformation cleaned and moved out of the rtcp_receiver_help.

webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
index 24861bd49e6aeb4963c2297b203bbdae4c550648..f9c6074c5044513fb71e8a6600201428e6bdd10b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -17,6 +17,7 @@
 
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/modules/rtp_rtcp/source/report_block_information.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
@@ -255,17 +256,18 @@ protected:
   typedef std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*>
       ReceivedInfoMap;
   // RTCP report block information mapped by remote SSRC.
-  typedef std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>
-      ReportBlockInfoMap;
+  typedef std::map<uint32_t, rtcp::ReportBlockInformation*> ReportBlockInfoMap;
   // RTCP report block information map mapped by source SSRC.
   typedef std::map<uint32_t, ReportBlockInfoMap> ReportBlockMap;
 
-  RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation(
-      uint32_t remote_ssrc, uint32_t source_ssrc)
-          EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
-  RTCPHelp::RTCPReportBlockInformation* GetReportBlockInformation(
-      uint32_t remote_ssrc, uint32_t source_ssrc) const
-          EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
+  rtcp::ReportBlockInformation* CreateOrGetReportBlockInformation(
+      uint32_t remote_ssrc,
+      uint32_t source_ssrc)
+      EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
+  const rtcp::ReportBlockInformation* GetReportBlockInformation(
+      uint32_t remote_ssrc,
+      uint32_t source_ssrc) const
+      EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   Clock* const _clock;
   const bool receiver_only_;