From 3993b18795b59ebfb12cb82dca9c01d30db2c0e7 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Wed, 27 Mar 2019 19:42:15 +0100
Subject: [PATCH] Use DefaultTaskQueueFactory in tool network_tester_server
 instead of using it via GlobalTaskQueueFactory helper

Bug: webrtc:10284
Change-Id: Ic8215143bc2ac555fb5b36bf1ea13780065c45a5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129934
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27330}
---
 rtc_tools/network_tester/BUILD.gn         | 1 +
 rtc_tools/network_tester/packet_sender.cc | 6 +++++-
 rtc_tools/network_tester/packet_sender.h  | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 151f9a7f38..ca2c04c4f1 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -44,6 +44,7 @@ if (rtc_enable_protobuf) {
       ":network_tester_config_proto",
       ":network_tester_packet_proto",
       "../../api/task_queue",
+      "../../api/task_queue:default_task_queue_factory",
       "../../p2p",
       "../../rtc_base",
       "../../rtc_base:checks",
diff --git a/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc
index fd863b1857..ecf9f5b3a0 100644
--- a/rtc_tools/network_tester/packet_sender.cc
+++ b/rtc_tools/network_tester/packet_sender.cc
@@ -17,6 +17,7 @@
 
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
+#include "api/task_queue/default_task_queue_factory.h"
 #include "api/task_queue/queued_task.h"
 #include "api/task_queue/task_queue_base.h"
 #include "rtc_base/time_utils.h"
@@ -85,7 +86,10 @@ PacketSender::PacketSender(TestController* test_controller,
       sending_(false),
       config_file_path_(config_file_path),
       test_controller_(test_controller),
-      worker_queue_("Packet Sender", rtc::TaskQueue::Priority::HIGH) {}
+      task_queue_factory_(CreateDefaultTaskQueueFactory()),
+      worker_queue_(task_queue_factory_->CreateTaskQueue(
+          "Packet Sender",
+          TaskQueueFactory::Priority::HIGH)) {}
 
 PacketSender::~PacketSender() = default;
 
diff --git a/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h
index 886a6f56fe..c6ec64eb6c 100644
--- a/rtc_tools/network_tester/packet_sender.h
+++ b/rtc_tools/network_tester/packet_sender.h
@@ -14,6 +14,7 @@
 #include <memory>
 #include <string>
 
+#include "api/task_queue/task_queue_factory.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/sequenced_task_checker.h"
@@ -55,6 +56,7 @@ class PacketSender {
   bool sending_ RTC_GUARDED_BY(worker_queue_checker_);
   const std::string config_file_path_;
   TestController* const test_controller_;
+  std::unique_ptr<TaskQueueFactory> task_queue_factory_;
   rtc::TaskQueue worker_queue_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PacketSender);