Cast: Refactor RTCP handling

media/cast/test/sender.cc

Index: media/cast/test/sender.cc
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index 6f9074f17ea48504da42af1298f2cd3bed9ef3d7..0ce23c8b51c52812bfb7464b67fe5c615c5832a4 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -123,7 +123,8 @@ void UpdateCastTransportStatus(
 
 void LogRawEvents(
     const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
-    const std::vector<media::cast::PacketEvent>& packet_events) {
+    const std::vector<media::cast::PacketEvent>& packet_events,
+    const std::vector<media::cast::FrameEvent>& frame_events) {
   VLOG(1) << "Got packet events from transport, size: " << packet_events.size();
   for (std::vector<media::cast::PacketEvent>::const_iterator it =
            packet_events.begin();
@@ -138,6 +139,17 @@ void LogRawEvents(
                                                    it->max_packet_id,
                                                    it->size);
   }
+  VLOG(1) << "Got frame events from transport, size: " << frame_events.size();
+  for (std::vector<media::cast::FrameEvent>::const_iterator it =
+           frame_events.begin();
+       it != frame_events.end();
+       ++it) {
+    cast_environment->Logging()->InsertFrameEvent(it->timestamp,
+                                                  it->type,
+                                                  it->media_type,
+                                                  it->rtp_timestamp,
+                                                  it->frame_id);
+  }
 }
 
 void InitializationResult(media::cast::CastInitializationStatus result) {
@@ -327,7 +339,6 @@ int main(int argc, char** argv) {
       media::cast::CreateDefaultVideoEncodeAcceleratorCallback(),
       media::cast::CreateDefaultVideoEncodeMemoryCallback());
   cast_sender->InitializeAudio(audio_config, base::Bind(&InitializationResult));
-  transport_sender->SetPacketReceiver(cast_sender->packet_receiver());
 
   // Set up event subscribers.
   scoped_ptr<media::cast::EncodingEventSubscriber> video_event_subscriber;