Index: media/cast/test/end2end_unittest.cc |
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc |
index 187ed4787b105ea7e7eb6f555dc98b9dd3ce81ae..708eeb5f4581c887a32dcd8e94bdc57646244a65 100644 |
--- a/media/cast/test/end2end_unittest.cc |
+++ b/media/cast/test/end2end_unittest.cc |
@@ -394,6 +394,7 @@ class End2EndTest : public ::testing::Test { |
: start_time_(), |
testing_clock_(new base::SimpleTestTickClock()), |
task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)), |
+ logging_config_(GetLoggingConfigWithRawEventsAndStatsEnabled()), |
cast_environment_(new CastEnvironment( |
scoped_ptr<base::TickClock>(testing_clock_).Pass(), |
task_runner_, |
@@ -402,7 +403,7 @@ class End2EndTest : public ::testing::Test { |
task_runner_, |
task_runner_, |
task_runner_, |
- GetLoggingConfigWithRawEventsAndStatsEnabled())), |
+ logging_config_)), |
receiver_to_sender_(cast_environment_), |
sender_to_receiver_(cast_environment_), |
test_receiver_audio_callback_(new TestReceiverAudioCallback()), |
@@ -484,7 +485,10 @@ class End2EndTest : public ::testing::Test { |
NULL, |
testing_clock_, |
transport_config_, |
+ logging_config_, |
base::Bind(&UpdateCastTransportStatus), |
+ base::Bind(&End2EndTest::LogRawEvents, base::Unretained(this)), |
+ base::TimeDelta::FromSeconds(1), |
task_runner_, |
&sender_to_receiver_)); |
@@ -514,7 +518,6 @@ class End2EndTest : public ::testing::Test { |
} |
virtual void TearDown() OVERRIDE { |
- |
cast_sender_.reset(); |
cast_receiver_.reset(); |
task_runner_->RunTasks(); |
@@ -546,6 +549,22 @@ class End2EndTest : public ::testing::Test { |
EXPECT_EQ(result, STATUS_INITIALIZED); |
} |
+ void LogRawEvents(const std::vector<PacketEvent>& packet_events) { |
+ EXPECT_FALSE(packet_events.empty()); |
+ for (std::vector<media::cast::PacketEvent>::const_iterator it = |
+ packet_events.begin(); |
+ it != packet_events.end(); |
+ ++it) { |
+ cast_environment_->Logging()->InsertPacketEvent(it->timestamp, |
+ it->type, |
+ it->rtp_timestamp, |
+ it->frame_id, |
+ it->packet_id, |
+ it->max_packet_id, |
+ it->size); |
+ } |
+ } |
+ |
AudioReceiverConfig audio_receiver_config_; |
VideoReceiverConfig video_receiver_config_; |
AudioSenderConfig audio_sender_config_; |
@@ -555,6 +574,7 @@ class End2EndTest : public ::testing::Test { |
base::TimeTicks start_time_; |
base::SimpleTestTickClock* testing_clock_; |
scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; |
+ CastLoggingConfig logging_config_; |
scoped_refptr<CastEnvironment> cast_environment_; |
LoopBackTransport receiver_to_sender_; |
@@ -575,6 +595,9 @@ class End2EndTest : public ::testing::Test { |
std::vector<FrameEvent> frame_events_; |
std::vector<PacketEvent> packet_events_; |
std::vector<GenericEvent> generic_events_; |
+ |
+ // For transport_sender_. |
+ base::MessageLoopForIO message_loop_; |
dcheng
2014/02/27 22:27:20
Where is this used?
imcheng
2014/02/28 00:15:06
CastTransportSenderImpl creates a RepeatingTimer w
dcheng
2014/02/28 19:46:11
OK, perhaps add a reference to the fact that CastT
imcheng
2014/03/03 19:00:09
Changed comments. I also changed it to a MessageLo
|
}; |
#if defined(OS_WIN) |