Cast: Simplify code path for RTCP sender report

chrome/renderer/media/cast_transport_sender_ipc.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/media/cast_transport_sender_ipc.h"
 
 #include "base/callback.h"
 #include "base/id_map.h"
 #include "chrome/common/cast_messages.h"
 #include "chrome/renderer/media/cast_ipc_dispatcher.h"
@@ skipping 45 matching lines @@
 void CastTransportSenderIPC::InsertCodedVideoFrame(
     const media::cast::transport::EncodedVideoFrame* video_frame,
     const base::TimeTicks& capture_time) {
   Send(new CastHostMsg_InsertCodedVideoFrame(channel_id_,
                                              *video_frame,
                                              capture_time));
 }
 
 void CastTransportSenderIPC::SendRtcpFromRtpSender(
     uint32 packet_type_flags,
-    const media::cast::transport::RtcpSenderInfo& sender_info,
+    uint32 ntp_seconds,
+    uint32 ntp_fraction,
+    uint32 rtp_timestamp,
     const media::cast::transport::RtcpDlrrReportBlock& dlrr,
     uint32 sending_ssrc,
     const std::string& c_name) {
   struct media::cast::transport::SendRtcpFromRtpSenderData data;
   data.packet_type_flags = packet_type_flags;
   data.sending_ssrc = sending_ssrc;
   data.c_name = c_name;
+  data.ntp_seconds = ntp_seconds;
+  data.ntp_fraction = ntp_fraction;
+  data.rtp_timestamp = rtp_timestamp;
   Send(new CastHostMsg_SendRtcpFromRtpSender(
       channel_id_,
       data,
-      sender_info,
       dlrr));
 }
 
 void CastTransportSenderIPC::ResendPackets(
     bool is_audio,
     const media::cast::MissingFramesAndPacketsMap& missing_packets) {
   Send(new CastHostMsg_ResendPackets(channel_id_,
                                      is_audio,
                                      missing_packets));
 }
 
-void CastTransportSenderIPC::SubscribeAudioRtpStatsCallback(
-    const media::cast::transport::CastTransportRtpStatistics& callback) {
-  audio_rtp_callback_ = callback;
-}
-
-void CastTransportSenderIPC::SubscribeVideoRtpStatsCallback(
-    const media::cast::transport::CastTransportRtpStatistics& callback) {
-  video_rtp_callback_ = callback;
-}
-
-
 void CastTransportSenderIPC::OnReceivedPacket(
     const media::cast::Packet& packet) {
   if (!packet_callback_.is_null()) {
     // TODO(hubbe): Perhaps an non-ownership-transferring cb here?
     scoped_ptr<media::cast::transport::Packet> packet_copy(
         new media::cast::transport::Packet(packet));
     packet_callback_.Run(packet_copy.Pass());
   } else {
     DVLOG(1) << "CastIPCDispatcher::OnReceivedPacket no packet callback yet.";
   }
 }
 
 void CastTransportSenderIPC::OnNotifyStatusChange(
     media::cast::transport::CastTransportStatus status) {
   status_callback_.Run(status);
 }
 
-void CastTransportSenderIPC::OnRtpStatistics(
-    bool audio,
-    const media::cast::transport::RtcpSenderInfo& sender_info,
-    base::TimeTicks time_sent,
-    uint32 rtp_timestamp) {
-  const media::cast::transport::CastTransportRtpStatistics& callback =
-      audio ? audio_rtp_callback_ : video_rtp_callback_;
-  callback.Run(sender_info, time_sent, rtp_timestamp);
-}
-
 void CastTransportSenderIPC::OnRawEvents(
     const std::vector<media::cast::PacketEvent>& packet_events) {
   raw_events_callback_.Run(packet_events);
 }
 
 void CastTransportSenderIPC::Send(IPC::Message* message) {
   if (CastIPCDispatcher::Get()) {
     CastIPCDispatcher::Get()->Send(message);
   } else {
     delete message;
   }
 }