Remove deprecated DirectTransport constructors
Remove deprecated DirectTransport constructors, now that they're no longer used in internal projects.
BUG=webrtc:8125
TBR=stefan@webrtc.org
Review-Url: https://codereview.webrtc.org/3006513002
Cr-Original-Commit-Position: refs/heads/master@{#19496}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 0860bee4026639f22acd53ea144731103f578448
diff --git a/test/direct_transport.cc b/test/direct_transport.cc
index e955c08..35f3f92 100644
--- a/test/direct_transport.cc
+++ b/test/direct_transport.cc
@@ -18,25 +18,6 @@
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,
const std::map<uint8_t, MediaType>& payload_type_map)
@@ -66,15 +47,7 @@
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 @@
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_);
diff --git a/test/direct_transport.h b/test/direct_transport.h
index 4be00a7..eee94be 100644
--- a/test/direct_transport.h
+++ b/test/direct_transport.h
@@ -32,25 +32,6 @@
// same task-queue - the one that's passed in via the constructor.
class DirectTransport : public Transport {
public:
- RTC_DEPRECATED DirectTransport(
- Call* send_call,
- const std::map<uint8_t, MediaType>& payload_type_map);
- RTC_DEPRECATED DirectTransport(
- const FakeNetworkPipe::Config& config,
- Call* send_call,
- const std::map<uint8_t, MediaType>& payload_type_map);
- RTC_DEPRECATED DirectTransport(
- const FakeNetworkPipe::Config& config,
- Call* send_call,
- std::unique_ptr<Demuxer> demuxer);
-
- // This deprecated variant always uses MediaType::VIDEO.
- RTC_DEPRECATED explicit DirectTransport(Call* send_call)
- : DirectTransport(
- FakeNetworkPipe::Config(),
- send_call,
- std::unique_ptr<Demuxer>(new ForceDemuxer(MediaType::VIDEO))) {}
-
DirectTransport(SingleThreadedTaskQueueForTesting* task_queue,
Call* send_call,
const std::map<uint8_t, MediaType>& payload_type_map);
@@ -82,21 +63,6 @@
int GetAverageDelayMs();
private:
- // TODO(minyue): remove when the deprecated ctors of DirectTransport that
- // create ForceDemuxer are removed.
- class ForceDemuxer : public Demuxer {
- public:
- explicit ForceDemuxer(MediaType media_type);
- void SetReceiver(PacketReceiver* receiver) override;
- void DeliverPacket(const NetworkPacket* packet,
- const PacketTime& packet_time) override;
-
- private:
- const MediaType media_type_;
- PacketReceiver* packet_receiver_;
- RTC_DISALLOW_COPY_AND_ASSIGN(ForceDemuxer);
- };
-
void SendPackets();
Call* const send_call_;
@@ -111,12 +77,6 @@
FakeNetworkPipe fake_network_;
rtc::SequencedTaskChecker sequence_checker_;
-
- // TODO(eladalon): https://bugs.chromium.org/p/webrtc/issues/detail?id=8125
- // Deprecated versions of the ctor don't get the task queue passed in from
- // outside. We'll create one locally for them. This is deprecated, and will
- // be removed as soon as the need for those ctors is removed.
- std::unique_ptr<SingleThreadedTaskQueueForTesting> deprecated_task_queue_;
};
} // namespace test
} // namespace webrtc
