Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 3 deletions

diff --git a/third_party/libwebrtc/rtc_base/task_queue_for_test.cc b/third_party/libwebrtc/rtc_base/task_queue_for_test.cc
index cb6b23ceae..e8993edcd1 100644
--- a/third_party/libwebrtc/rtc_base/task_queue_for_test.cc
+++ b/third_party/libwebrtc/rtc_base/task_queue_for_test.cc
@@ -10,12 +10,28 @@
 
 #include "rtc_base/task_queue_for_test.h"
 
+#include <memory>
+#include <utility>
+
 #include "api/task_queue/default_task_queue_factory.h"
+#include "api/task_queue/task_queue_base.h"
 
 namespace webrtc {
 
-TaskQueueForTest::TaskQueueForTest(absl::string_view name, Priority priority)
-    : TaskQueue(
-          CreateDefaultTaskQueueFactory()->CreateTaskQueue(name, priority)) {}
+TaskQueueForTest::TaskQueueForTest(
+    std::unique_ptr<TaskQueueBase, TaskQueueDeleter> task_queue)
+    : impl_(std::move(task_queue)) {}
+
+TaskQueueForTest::TaskQueueForTest(absl::string_view name,
+                                   TaskQueueFactory::Priority priority)
+    : impl_(CreateDefaultTaskQueueFactory()->CreateTaskQueue(name, priority)) {}
+
+TaskQueueForTest::~TaskQueueForTest() {
+  // Stop the TaskQueue before invalidating impl_ pointer so that tasks that
+  // race with the TaskQueueForTest destructor could still use TaskQueueForTest
+  // functions like 'IsCurrent'.
+  impl_.get_deleter()(impl_.get());
+  impl_.release();
+}
 
 }  // namespace webrtc