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/audio/BUILD.gn b/audio/BUILD.gn
index b24584c..fa16bb7 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -102,6 +102,7 @@
deps = [
":audio",
"../api:simulated_network_api",
+ "../api/task_queue",
"../call:fake_network",
"../call:simulated_network",
"../system_wrappers",
diff --git a/audio/test/audio_bwe_integration_test.cc b/audio/test/audio_bwe_integration_test.cc
index ac8eb33..eed7acb 100644
--- a/audio/test/audio_bwe_integration_test.cc
+++ b/audio/test/audio_bwe_integration_test.cc
@@ -58,10 +58,10 @@
send_audio_device_ = send_audio_device;
}
-test::PacketTransport* AudioBweTest::CreateSendTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue,
+std::unique_ptr<test::PacketTransport> AudioBweTest::CreateSendTransport(
+ TaskQueueBase* task_queue,
Call* sender_call) {
- return new test::PacketTransport(
+ return std::make_unique<test::PacketTransport>(
task_queue, sender_call, this, test::PacketTransport::kSender,
test::CallTest::payload_type_map_,
std::make_unique<FakeNetworkPipe>(
@@ -69,9 +69,9 @@
std::make_unique<SimulatedNetwork>(GetNetworkPipeConfig())));
}
-test::PacketTransport* AudioBweTest::CreateReceiveTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue) {
- return new test::PacketTransport(
+std::unique_ptr<test::PacketTransport> AudioBweTest::CreateReceiveTransport(
+ TaskQueueBase* task_queue) {
+ return std::make_unique<test::PacketTransport>(
task_queue, nullptr, this, test::PacketTransport::kReceiver,
test::CallTest::payload_type_map_,
std::make_unique<FakeNetworkPipe>(
diff --git a/audio/test/audio_bwe_integration_test.h b/audio/test/audio_bwe_integration_test.h
index 78e783a..613efcc 100644
--- a/audio/test/audio_bwe_integration_test.h
+++ b/audio/test/audio_bwe_integration_test.h
@@ -13,9 +13,9 @@
#include <memory>
#include <string>
+#include "api/task_queue/task_queue_base.h"
#include "api/test/simulated_network.h"
#include "test/call_test.h"
-#include "test/single_threaded_task_queue.h"
namespace webrtc {
namespace test {
@@ -39,11 +39,11 @@
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) override;
- test::PacketTransport* CreateSendTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue,
+ std::unique_ptr<test::PacketTransport> CreateSendTransport(
+ TaskQueueBase* task_queue,
Call* sender_call) override;
- test::PacketTransport* CreateReceiveTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue) override;
+ std::unique_ptr<test::PacketTransport> CreateReceiveTransport(
+ TaskQueueBase* task_queue) override;
void PerformTest() override;
diff --git a/audio/test/audio_end_to_end_test.cc b/audio/test/audio_end_to_end_test.cc
index 40d1226..896b0f2 100644
--- a/audio/test/audio_end_to_end_test.cc
+++ b/audio/test/audio_end_to_end_test.cc
@@ -13,6 +13,7 @@
#include <algorithm>
#include <memory>
+#include "api/task_queue/task_queue_base.h"
#include "call/fake_network_pipe.h"
#include "call/simulated_network.h"
#include "system_wrappers/include/sleep.h"
@@ -62,10 +63,10 @@
send_audio_device_ = send_audio_device;
}
-test::PacketTransport* AudioEndToEndTest::CreateSendTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue,
+std::unique_ptr<test::PacketTransport> AudioEndToEndTest::CreateSendTransport(
+ TaskQueueBase* task_queue,
Call* sender_call) {
- return new test::PacketTransport(
+ return std::make_unique<test::PacketTransport>(
task_queue, sender_call, this, test::PacketTransport::kSender,
test::CallTest::payload_type_map_,
std::make_unique<FakeNetworkPipe>(
@@ -73,9 +74,9 @@
std::make_unique<SimulatedNetwork>(GetNetworkPipeConfig())));
}
-test::PacketTransport* AudioEndToEndTest::CreateReceiveTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue) {
- return new test::PacketTransport(
+std::unique_ptr<test::PacketTransport>
+AudioEndToEndTest::CreateReceiveTransport(TaskQueueBase* task_queue) {
+ return std::make_unique<test::PacketTransport>(
task_queue, nullptr, this, test::PacketTransport::kReceiver,
test::CallTest::payload_type_map_,
std::make_unique<FakeNetworkPipe>(
diff --git a/audio/test/audio_end_to_end_test.h b/audio/test/audio_end_to_end_test.h
index b729c75..c47cb47 100644
--- a/audio/test/audio_end_to_end_test.h
+++ b/audio/test/audio_end_to_end_test.h
@@ -14,6 +14,7 @@
#include <string>
#include <vector>
+#include "api/task_queue/task_queue_base.h"
#include "api/test/simulated_network.h"
#include "test/call_test.h"
@@ -42,11 +43,11 @@
TestAudioDeviceModule* send_audio_device,
TestAudioDeviceModule* recv_audio_device) override;
- test::PacketTransport* CreateSendTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue,
+ std::unique_ptr<test::PacketTransport> CreateSendTransport(
+ TaskQueueBase* task_queue,
Call* sender_call) override;
- test::PacketTransport* CreateReceiveTransport(
- DEPRECATED_SingleThreadedTaskQueueForTesting* task_queue) override;
+ std::unique_ptr<test::PacketTransport> CreateReceiveTransport(
+ TaskQueueBase* task_queue) override;
void ModifyAudioConfigs(
AudioSendStream::Config* send_config,