Revert of Make rtcp parsing implementation private in RtcpReceiver

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 e9d2c94b7c924db149541950cc938e6ccca375c1..365937474f78cee0c6c8d4f0cac61edf0895aac0 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -60,6 +60,13 @@
   void SetRemoteSSRC(uint32_t ssrc);
   uint32_t RemoteSSRC() const;
 
+  int32_t IncomingRTCPPacket(
+      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
+      RTCPUtility::RTCPParserV2* rtcpParser);
+
+  void TriggerCallbacksFromRTCPPacket(
+      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation);
+
   // get received cname
   int32_t CNAME(uint32_t remoteSSRC, char cName[RTCP_CNAME_SIZE]) const;
 
@@ -108,21 +115,7 @@
   void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback);
   RtcpStatisticsCallback* GetRtcpStatisticsCallback();
 
- private:
-  using ReceivedInfoMap = std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*>;
-  // RTCP report block information mapped by remote SSRC.
-  using ReportBlockInfoMap =
-      std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>;
-  // RTCP report block information map mapped by source SSRC.
-  using ReportBlockMap = std::map<uint32_t, ReportBlockInfoMap>;
-
-  int32_t IncomingRTCPPacket(
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
-      RTCPUtility::RTCPParserV2* rtcpParser);
-
-  void TriggerCallbacksFromRTCPPacket(
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation);
-
+ protected:
   RTCPUtility::RTCPCnameInformation* CreateCnameInformation(
       uint32_t remoteSSRC);
   RTCPUtility::RTCPCnameInformation* GetCnameInformation(
@@ -259,6 +252,14 @@
       RTCPUtility::RTCPParserV2* rtcp_parser,
       RTCPHelp::RTCPPacketInformation* rtcp_packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
+
+ private:
+  typedef std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*> ReceivedInfoMap;
+  // RTCP report block information mapped by remote SSRC.
+  typedef std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>
+      ReportBlockInfoMap;
+  // RTCP report block information map mapped by source SSRC.
+  typedef std::map<uint32_t, ReportBlockInfoMap> ReportBlockMap;
 
   RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation(
       uint32_t remote_ssrc,