Cast: Simplify code path for RTCP sender report

chrome/common/cast_messages.h

Index: chrome/common/cast_messages.h
diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h
index 1589216231a90b9de8942d1a963b8bffd8254cd5..828ef495223070a2b4bef71c717e74a061ec7651 100644
--- a/chrome/common/cast_messages.h
+++ b/chrome/common/cast_messages.h
@@ -42,14 +42,6 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedVideoFrame)
   IPC_STRUCT_TRAITS_MEMBER(data)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpSenderInfo)
-  IPC_STRUCT_TRAITS_MEMBER(ntp_seconds)
-  IPC_STRUCT_TRAITS_MEMBER(ntp_fraction)
-  IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
-  IPC_STRUCT_TRAITS_MEMBER(send_packet_count)
-  IPC_STRUCT_TRAITS_MEMBER(send_octet_count)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpDlrrReportBlock)
   IPC_STRUCT_TRAITS_MEMBER(last_rr)
   IPC_STRUCT_TRAITS_MEMBER(delay_since_last_rr)
@@ -84,6 +76,9 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::SendRtcpFromRtpSenderData)
   IPC_STRUCT_TRAITS_MEMBER(packet_type_flags)
   IPC_STRUCT_TRAITS_MEMBER(sending_ssrc)
   IPC_STRUCT_TRAITS_MEMBER(c_name)
+  IPC_STRUCT_TRAITS_MEMBER(ntp_seconds)
+  IPC_STRUCT_TRAITS_MEMBER(ntp_fraction)
+  IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::PacketEvent)
@@ -107,14 +102,6 @@ IPC_MESSAGE_CONTROL2(
     int32 /* channel_id */,
     media::cast::transport::CastTransportStatus /* status */);
 
-IPC_MESSAGE_CONTROL5(
-    CastMsg_RtpStatistics,
-    int32 /* channel_id */,
-    bool /* audio */,
-    media::cast::transport::RtcpSenderInfo /* sender_info */,
-    base::TimeTicks /* time_sent */,
-    uint32 /* rtp_timestamp */);
-
 IPC_MESSAGE_CONTROL2(CastMsg_RawEvents,
                      int32 /* channel_id */,
                      std::vector<media::cast::PacketEvent> /* packet_events */);
@@ -143,11 +130,10 @@ IPC_MESSAGE_CONTROL3(
     media::cast::transport::EncodedVideoFrame /* video_frame */,
     base::TimeTicks /* recorded_time */)
 
-IPC_MESSAGE_CONTROL4(
+IPC_MESSAGE_CONTROL3(
     CastHostMsg_SendRtcpFromRtpSender,
     int32 /* channel_id */,
-    media::cast::transport::SendRtcpFromRtpSenderData /* flags, ssrc, name */,
-    media::cast::transport::RtcpSenderInfo /* sender_info */,
+    media::cast::transport::SendRtcpFromRtpSenderData /* data */,
     media::cast::transport::RtcpDlrrReportBlock /* dlrr */)
 
 IPC_MESSAGE_CONTROL3(