[rtcp] Tmmbn/Tmmbr Parse updated not to use RTCPUtility

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
index c84d0dfe0b92fa2dd031d93897d8507a603de7bb..a801816650c8f8bb0d9d42a941b14bbf46d338a6 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
@@ -17,22 +17,22 @@
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 
 namespace webrtc {
 namespace rtcp {
+class CommonHeader;
+
 // Temporary Maximum Media Stream Bit Rate Notification (TMMBN).
 // RFC 5104, Section 4.2.2.
 class Tmmbn : public Rtpfb {
  public:
-  static const uint8_t kFeedbackMessageType = 4;
+  static constexpr uint8_t kFeedbackMessageType = 4;
 
   Tmmbn() {}
   ~Tmmbn() 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 WithTmmbr(uint32_t ssrc, uint32_t bitrate_kbps, uint16_t overhead) {
     WithTmmbr(TmmbItem(ssrc, bitrate_kbps * 1000, overhead));