Cast: Refactor RTCP handling

media/cast/net/rtcp/mock_rtcp_receiver_feedback.h

Index: media/cast/net/rtcp/mock_rtcp_receiver_feedback.h
diff --git a/media/cast/net/rtcp/mock_rtcp_receiver_feedback.h b/media/cast/net/rtcp/mock_rtcp_receiver_feedback.h
index 38bf0eec28a8c24199ca1f0a0bed4c62e12ae7a6..ae6b96e56d6cb4eac1335f1a7b63212b8152c17b 100644
--- a/media/cast/net/rtcp/mock_rtcp_receiver_feedback.h
+++ b/media/cast/net/rtcp/mock_rtcp_receiver_feedback.h
@@ -15,7 +15,8 @@
 namespace media {
 namespace cast {
 
-class MockRtcpReceiverFeedback : public RtcpReceiverFeedback {
+// TODO(hclam): Should be renamed to MockRtcpMessageHandler.
+class MockRtcpReceiverFeedback : public RtcpMessageHandler {
  public:
   MockRtcpReceiverFeedback();
   virtual ~MockRtcpReceiverFeedback();
@@ -30,17 +31,12 @@ class MockRtcpReceiverFeedback : public RtcpReceiverFeedback {
 
   MOCK_METHOD1(OnReceivedReceiverLog,
                void(const RtcpReceiverLogMessage& receiver_log));
-};
 
-class MockRtcpRttFeedback : public RtcpRttFeedback {
- public:
-  MockRtcpRttFeedback();
-  virtual ~MockRtcpRttFeedback();
+  MOCK_METHOD2(OnReceivedDelaySinceLastReport,
+               void(uint32 last_report, uint32 delay_since_last_report));
 
-  MOCK_METHOD3(OnReceivedDelaySinceLastReport,
-               void(uint32 media_ssrc,
-                    uint32 last_report,
-                    uint32 delay_since_last_report));
+  MOCK_METHOD1(OnReceivedCastFeedback,
+               void(const RtcpCastMessage& cast_message));
 };
 
 }  // namespace cast