[rtcp] Fir/Sli/Rpsi updated not to use RTCPUtility

webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h
index 7b6b24f3b8d903fd217a952bdb9bf7408fad7cb7..ce1dfe5bc55c27db684356773c490fe702d784d7 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
-
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_
 
@@ -17,18 +16,18 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 
 namespace webrtc {
 namespace rtcp {
+class CommonHeader;
 
 // Slice loss indication (SLI) (RFC 4585).
 class Sli : public Psfb {
  public:
-  static const uint8_t kFeedbackMessageType = 2;
+  static constexpr uint8_t kFeedbackMessageType = 2;
   class Macroblocks {
    public:
-    static const size_t kLength = 4;
+    static constexpr size_t kLength = 4;
     Macroblocks() : item_(0) {}
     Macroblocks(uint8_t picture_id, uint16_t first, uint16_t number);
     ~Macroblocks() {}
@@ -45,11 +44,10 @@ class Sli : public Psfb {
   };
 
   Sli() {}
-  virtual ~Sli() {}
+  ~Sli() override {}
 
   // Parse assumes header is already parsed and validated.
-  bool Parse(const RTCPUtility::RtcpCommonHeader& header,
-             const uint8_t* payload);  // Size of the payload is in the header.
+  bool Parse(const CommonHeader& packet);
 
   void WithPictureId(uint8_t picture_id,
                      uint16_t first_macroblock = 0,