Cast: Refactor RTCP handling

media/cast/test/end2end_unittest.cc

Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index a1d4a3ab3479f87c01496dfdf0c04263fbbd8804..95661be666911acdaaeebbb8162aec9ec972390b 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -603,9 +603,10 @@ class End2EndTest : public ::testing::Test {
                                   CreateDefaultVideoEncodeAcceleratorCallback(),
                                   CreateDefaultVideoEncodeMemoryCallback());
 
-    receiver_to_sender_.SetPacketReceiver(cast_sender_->packet_receiver(),
-                                          task_runner_,
-                                          &testing_clock_);
+    receiver_to_sender_.SetPacketReceiver(
+        transport_sender_->PacketReceiverForTesting(),
+        task_runner_,
+        &testing_clock_);
     sender_to_receiver_.SetPacketReceiver(cast_receiver_->packet_receiver(),
                                           task_runner_,
                                           &testing_clock_);
@@ -715,7 +716,8 @@ class End2EndTest : public ::testing::Test {
                    base::Unretained(this)));
   }
 
-  void LogRawEvents(const std::vector<PacketEvent>& packet_events) {
+  void LogRawEvents(const std::vector<PacketEvent>& packet_events,
+                    const std::vector<FrameEvent>& frame_events) {
     EXPECT_FALSE(packet_events.empty());
     for (std::vector<media::cast::PacketEvent>::const_iterator it =
              packet_events.begin();
@@ -730,6 +732,16 @@ class End2EndTest : public ::testing::Test {
                                                              it->max_packet_id,
                                                              it->size);
     }
+    for (std::vector<media::cast::FrameEvent>::const_iterator it =
+             frame_events.begin();
+         it != frame_events.end();
+         ++it) {
+      cast_environment_sender_->Logging()->InsertFrameEvent(it->timestamp,
+                                                            it->type,
+                                                            it->media_type,
+                                                            it->rtp_timestamp,
+                                                            it->frame_id);
+    }
   }
 
   FrameReceiverConfig audio_receiver_config_;