Index: webrtc/test/direct_transport.cc |
diff --git a/webrtc/test/direct_transport.cc b/webrtc/test/direct_transport.cc |
index e955c08d35b8cc739dc3e42ff9806da2b10bbc29..35f3f92bfc51b1a139b24d5592dea851db05f663 100644 |
--- a/webrtc/test/direct_transport.cc |
+++ b/webrtc/test/direct_transport.cc |
@@ -17,25 +17,6 @@ |
namespace webrtc { |
namespace test { |
-DirectTransport::DirectTransport( |
- Call* send_call, |
- const std::map<uint8_t, MediaType>& payload_type_map) |
- : DirectTransport(FakeNetworkPipe::Config(), send_call, payload_type_map) {} |
- |
-DirectTransport::DirectTransport( |
- const FakeNetworkPipe::Config& config, |
- Call* send_call, |
- const std::map<uint8_t, MediaType>& payload_type_map) |
- : DirectTransport( |
- config, |
- send_call, |
- std::unique_ptr<Demuxer>(new DemuxerImpl(payload_type_map))) {} |
- |
-DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config, |
- Call* send_call, |
- std::unique_ptr<Demuxer> demuxer) |
- : DirectTransport(nullptr, config, send_call, std::move(demuxer)) {} |
- |
DirectTransport::DirectTransport( |
SingleThreadedTaskQueueForTesting* task_queue, |
Call* send_call, |
@@ -66,15 +47,7 @@ DirectTransport::DirectTransport(SingleThreadedTaskQueueForTesting* task_queue, |
clock_(Clock::GetRealTimeClock()), |
task_queue_(task_queue), |
fake_network_(clock_, config, std::move(demuxer)) { |
- // TODO(eladalon): When the deprecated ctors are removed, this check |
- // can be restored. https://bugs.chromium.org/p/webrtc/issues/detail?id=8125 |
- // RTC_DCHECK(task_queue); |
- if (!task_queue) { |
- deprecated_task_queue_ = |
- rtc::MakeUnique<SingleThreadedTaskQueueForTesting>("deprecated_queue"); |
- task_queue_ = deprecated_task_queue_.get(); |
- } |
- |
+ RTC_DCHECK(task_queue); |
if (send_call_) { |
send_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp); |
send_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp); |
@@ -124,22 +97,6 @@ int DirectTransport::GetAverageDelayMs() { |
return fake_network_.AverageDelay(); |
} |
-DirectTransport::ForceDemuxer::ForceDemuxer(MediaType media_type) |
- : media_type_(media_type) {} |
- |
-void DirectTransport::ForceDemuxer::SetReceiver(PacketReceiver* receiver) { |
- packet_receiver_ = receiver; |
-} |
- |
-void DirectTransport::ForceDemuxer::DeliverPacket( |
- const NetworkPacket* packet, |
- const PacketTime& packet_time) { |
- if (!packet_receiver_) |
- return; |
- packet_receiver_->DeliverPacket(media_type_, packet->data(), |
- packet->data_length(), packet_time); |
-} |
- |
void DirectTransport::SendPackets() { |
RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); |