Propagate task queue to create test::DirectTransport by TaskQueueBase interface actual task queue implementation for these tests is intentionally unchanged for now. while at it, change return type of created transports to unique_ptr to note passing ownership. Bug: webrtc:10933 Change-Id: I324597b503e647c471f43511340eb9c07ba03ee8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154743 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29335}
diff --git a/test/call_test.cc b/test/call_test.cc index 557c842..30369a6 100644 --- a/test/call_test.cc +++ b/test/call_test.cc
@@ -16,6 +16,7 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/task_queue/default_task_queue_factory.h" +#include "api/task_queue/task_queue_base.h" #include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video_codecs/video_encoder_config.h" #include "call/fake_network_pipe.h" @@ -133,9 +134,9 @@ CreateReceiverCall(recv_config); } test->OnCallsCreated(sender_call_.get(), receiver_call_.get()); - receive_transport_.reset(test->CreateReceiveTransport(&task_queue_)); - send_transport_.reset( - test->CreateSendTransport(&task_queue_, sender_call_.get())); + receive_transport_ = test->CreateReceiveTransport(&task_queue_); + send_transport_ = + test->CreateSendTransport(&task_queue_, sender_call_.get()); if (test->ShouldCreateReceivers()) { send_transport_->SetReceiver(receiver_call_->Receiver()); @@ -776,10 +777,10 @@ void BaseTest::OnCallsCreated(Call* sender_call, Call* receiver_call) {} -test::PacketTransport* BaseTest::CreateSendTransport( - DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue, +std::unique_ptr<PacketTransport> BaseTest::CreateSendTransport( + TaskQueueBase* task_queue, Call* sender_call) { - return new PacketTransport( + return std::make_unique<PacketTransport>( task_queue, sender_call, this, test::PacketTransport::kSender, CallTest::payload_type_map_, std::make_unique<FakeNetworkPipe>( @@ -787,9 +788,9 @@ std::make_unique<SimulatedNetwork>(BuiltInNetworkBehaviorConfig()))); } -test::PacketTransport* BaseTest::CreateReceiveTransport( - DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue) { - return new PacketTransport( +std::unique_ptr<PacketTransport> BaseTest::CreateReceiveTransport( + TaskQueueBase* task_queue) { + return std::make_unique<PacketTransport>( task_queue, nullptr, this, test::PacketTransport::kReceiver, CallTest::payload_type_map_, std::make_unique<FakeNetworkPipe>(
diff --git a/test/call_test.h b/test/call_test.h index b1990a7..234741b 100644 --- a/test/call_test.h +++ b/test/call_test.h
@@ -17,6 +17,7 @@ #include "absl/types/optional.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_factory.h" #include "api/test/video/function_video_decoder_factory.h" #include "api/test/video/function_video_encoder_factory.h" @@ -260,11 +261,11 @@ virtual void OnCallsCreated(Call* sender_call, Call* receiver_call); - virtual test::PacketTransport* CreateSendTransport( - DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue, + virtual std::unique_ptr<test::PacketTransport> CreateSendTransport( + TaskQueueBase* task_queue, Call* sender_call); - virtual test::PacketTransport* CreateReceiveTransport( - DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue); + virtual std::unique_ptr<test::PacketTransport> CreateReceiveTransport( + TaskQueueBase* task_queue); virtual void ModifyVideoConfigs( VideoSendStream::Config* send_config,
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h index 956eb00..b6b521d 100644 --- a/test/rtp_rtcp_observer.h +++ b/test/rtp_rtcp_observer.h
@@ -85,7 +85,7 @@ public: enum TransportType { kReceiver, kSender }; - PacketTransport(DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue, + PacketTransport(TaskQueueBase* task_queue, Call* send_call, RtpRtcpObserver* observer, TransportType transport_type,