From 982b576bcaeafee1a12f4ddcf1c7847549d0de14 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 21 Mar 2019 09:58:30 +0100 Subject: [PATCH] Avoid using GlobalTaskQueueFactory in NetworkEmulationManager by using TaskQueueForTest that use Default task queue factory directly Bug: webrtc:10284 Change-Id: I775911c72851e850a9364714008397cf4d3ab484 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128613 Reviewed-by: Artem Titov Reviewed-by: Sebastian Jansson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#27217} --- test/scenario/network/BUILD.gn | 2 +- test/scenario/network/network_emulation_manager.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/scenario/network/BUILD.gn b/test/scenario/network/BUILD.gn index 7b03a9b51f..7ce21432a2 100644 --- a/test/scenario/network/BUILD.gn +++ b/test/scenario/network/BUILD.gn @@ -34,8 +34,8 @@ rtc_source_set("emulated_network") { "../../../api/units:timestamp", "../../../rtc_base:rtc_base", "../../../rtc_base:rtc_base_tests_utils", - "../../../rtc_base:rtc_task_queue", "../../../rtc_base:safe_minmax", + "../../../rtc_base:task_queue_for_test", "../../../rtc_base/task_utils:repeating_task", "../../../rtc_base/third_party/sigslot:sigslot", "../../../system_wrappers:system_wrappers", diff --git a/test/scenario/network/network_emulation_manager.h b/test/scenario/network/network_emulation_manager.h index 8290ec30f1..37f52f3dac 100644 --- a/test/scenario/network/network_emulation_manager.h +++ b/test/scenario/network/network_emulation_manager.h @@ -21,7 +21,7 @@ #include "api/units/timestamp.h" #include "rtc_base/logging.h" #include "rtc_base/network.h" -#include "rtc_base/task_queue.h" +#include "rtc_base/task_queue_for_test.h" #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread.h" #include "system_wrappers/include/clock.h" @@ -90,7 +90,7 @@ class NetworkEmulationManagerImpl : public NetworkEmulationManager { // Must be the last field, so it will be deleted first, because tasks // in the TaskQueue can access other fields of the instance of this class. - rtc::TaskQueue task_queue_; + TaskQueueForTest task_queue_; }; } // namespace test