Index: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc |
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc |
index 40dddde06a2c78d745e723c853f39541b601999e..1a51b89c63a1510ae2087d52eeecda0783a9df17 100644 |
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc |
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc |
@@ -103,7 +103,6 @@ class RtpPacketizerTest : public ::testing::Test { |
: task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)), |
video_frame_(), |
packet_storage_(&testing_clock_, kMaxPacketStorageTimeMs) { |
- logging_.AddRawEventSubscriber(&subscriber_); |
config_.sequence_number = kSeqNum; |
config_.ssrc = kSsrc; |
config_.payload_type = kPayload; |
@@ -113,7 +112,7 @@ class RtpPacketizerTest : public ::testing::Test { |
&testing_clock_, &logging_, transport_.get(), task_runner_)); |
pacer_->RegisterVideoSsrc(config_.ssrc); |
rtp_packetizer_.reset(new RtpPacketizer( |
- pacer_.get(), &packet_storage_, config_, &testing_clock_, &logging_)); |
+ pacer_.get(), &packet_storage_, config_)); |
video_frame_.key_frame = false; |
video_frame_.frame_id = 0; |
video_frame_.last_referenced_frame_id = kStartFrameId; |
@@ -122,10 +121,6 @@ class RtpPacketizerTest : public ::testing::Test { |
GetVideoRtpTimestamp(testing_clock_.NowTicks()); |
} |
- virtual ~RtpPacketizerTest() { |
- logging_.RemoveRawEventSubscriber(&subscriber_); |
- } |
- |
void RunTasks(int during_ms) { |
for (int i = 0; i < during_ms; ++i) { |
// Call process the timers every 1 ms. |
@@ -141,7 +136,6 @@ class RtpPacketizerTest : public ::testing::Test { |
RtpPacketizerConfig config_; |
scoped_ptr<TestRtpPacketTransport> transport_; |
LoggingImpl logging_; |
- SimpleEventSubscriber subscriber_; |
scoped_ptr<PacedSender> pacer_; |
scoped_ptr<RtpPacketizer> rtp_packetizer_; |
@@ -158,18 +152,6 @@ TEST_F(RtpPacketizerTest, SendStandardPackets) { |
rtp_packetizer_->IncomingEncodedVideoFrame(&video_frame_, time); |
RunTasks(33 + 1); |
EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received()); |
- std::vector<PacketEvent> packet_events; |
- subscriber_.GetPacketEventsAndReset(&packet_events); |
- int expected_num_video_sent_to_pacer_count = expected_num_of_packets; |
- int num_video_sent_to_pacer_count = 0; |
- for (std::vector<PacketEvent>::iterator it = packet_events.begin(); |
- it != packet_events.end(); |
- ++it) { |
- if (it->type == kVideoPacketSentToPacer) |
- num_video_sent_to_pacer_count++; |
- } |
- EXPECT_EQ(expected_num_video_sent_to_pacer_count, |
- num_video_sent_to_pacer_count); |
} |
TEST_F(RtpPacketizerTest, Stats) { |