From 1a16da1cf22c5986e75a9d65cdd067642c240ef4 Mon Sep 17 00:00:00 2001 From: "Piotr (Peter) Slatala" Date: Fri, 22 Feb 2019 10:39:55 -0800 Subject: [PATCH] Remove deprecated CreateMediaTransport method Bug: webrtc:9719 Change-Id: I4aef407c4770fc98abcbc114b87e73bbf13d8f56 Reviewed-on: https://webrtc-review.googlesource.com/c/124021 Reviewed-by: Steve Anton Reviewed-by: Anton Sukhanov Reviewed-by: Bjorn Mellem Commit-Queue: Peter Slatala Cr-Commit-Position: refs/heads/master@{#26860} --- api/media_transport_interface.cc | 10 ---------- api/media_transport_interface.h | 11 ----------- api/test/fake_media_transport.h | 9 --------- pc/channel_manager_unittest.cc | 8 +++++--- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index abd9861652..c3f3d19063 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -33,16 +33,6 @@ MediaTransportSettings::~MediaTransportSettings() = default; SendDataParams::SendDataParams() = default; SendDataParams::SendDataParams(const SendDataParams&) = default; -RTCErrorOr> -MediaTransportFactory::CreateMediaTransport( - rtc::PacketTransportInternal* packet_transport, - rtc::Thread* network_thread, - bool is_caller) { - MediaTransportSettings settings; - settings.is_caller = is_caller; - return CreateMediaTransport(packet_transport, network_thread, settings); -} - RTCErrorOr> MediaTransportFactory::CreateMediaTransport( rtc::PacketTransportInternal* packet_transport, diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index edbd3b1da0..0b7584505e 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -318,17 +318,6 @@ class MediaTransportFactory { // - Does not take ownership of packet_transport or network_thread. // - Does not support group calls, in 1:1 call one side must set // is_caller = true and another is_caller = false. - // TODO(bugs.webrtc.org/9938) This constructor will be removed and replaced - // with the one below. - virtual RTCErrorOr> - CreateMediaTransport(rtc::PacketTransportInternal* packet_transport, - rtc::Thread* network_thread, - bool is_caller); - - // Creates media transport. - // - Does not take ownership of packet_transport or network_thread. - // TODO(bugs.webrtc.org/9938): remove default implementation once all children - // override it. virtual RTCErrorOr> CreateMediaTransport(rtc::PacketTransportInternal* packet_transport, rtc::Thread* network_thread, diff --git a/api/test/fake_media_transport.h b/api/test/fake_media_transport.h index 86c0b76b59..16cd1bad87 100644 --- a/api/test/fake_media_transport.h +++ b/api/test/fake_media_transport.h @@ -110,15 +110,6 @@ class FakeMediaTransportFactory : public MediaTransportFactory { FakeMediaTransportFactory() = default; ~FakeMediaTransportFactory() = default; - RTCErrorOr> CreateMediaTransport( - rtc::PacketTransportInternal* packet_transport, - rtc::Thread* network_thread, - bool is_caller) override { - MediaTransportSettings settings; - settings.is_caller = is_caller; - return CreateMediaTransport(packet_transport, network_thread, settings); - } - RTCErrorOr> CreateMediaTransport( rtc::PacketTransportInternal* packet_transport, rtc::Thread* network_thread, diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc index 36b798181b..03c68ea0d2 100644 --- a/pc/channel_manager_unittest.cc +++ b/pc/channel_manager_unittest.cc @@ -69,10 +69,12 @@ class ChannelManagerTest : public testing::Test { std::unique_ptr CreateMediaTransport( rtc::PacketTransportInternal* packet_transport) { + webrtc::MediaTransportSettings settings; + settings.is_caller = true; auto media_transport_result = - fake_media_transport_factory_.CreateMediaTransport(packet_transport, - network_.get(), - /*is_caller=*/true); + fake_media_transport_factory_.CreateMediaTransport( + packet_transport, network_.get(), + /*is_caller=*/settings); RTC_CHECK(media_transport_result.ok()); return media_transport_result.MoveValue(); }