From 2548d224dc01d819252ae0569356ba707a6d1806 Mon Sep 17 00:00:00 2001
From: Markus Handell <handellm@webrtc.org>
Date: Wed, 18 Sep 2024 09:48:20 +0200
Subject: [PATCH] WebRTC-TaskQueue-ReplaceLibeventWithStdlib: Launch stdlib
 task queue.

Bug: b/42224654
Change-Id: Ib55420fca40a993790eff3e554ed02d6b3731a6b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362780
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43050}
---
 ..._queue_factory_stdlib_or_libevent_experiment.cc | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc b/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc
index dc6e835907..251c6c6091 100644
--- a/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc
+++ b/api/task_queue/default_task_queue_factory_stdlib_or_libevent_experiment.cc
@@ -13,26 +13,14 @@
 #include "api/field_trials_view.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "api/transport/field_trial_based_config.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/memory/always_valid_pointer.h"
-#include "rtc_base/task_queue_libevent.h"
 #include "rtc_base/task_queue_stdlib.h"
 
 namespace webrtc {
 
 std::unique_ptr<TaskQueueFactory> CreateDefaultTaskQueueFactory(
     const FieldTrialsView* field_trials_view) {
-  AlwaysValidPointer<const FieldTrialsView, FieldTrialBasedConfig> field_trials(
-      field_trials_view);
-  if (field_trials->IsEnabled("WebRTC-TaskQueue-ReplaceLibeventWithStdlib")) {
-    RTC_LOG(LS_INFO) << "WebRTC-TaskQueue-ReplaceLibeventWithStdlib: "
-                     << "using TaskQueueStdlibFactory.";
-    return CreateTaskQueueStdlibFactory();
-  }
-
-  RTC_LOG(LS_INFO) << "WebRTC-TaskQueue-ReplaceLibeventWithStdlib: "
-                   << "using TaskQueueLibeventFactory.";
-  return CreateTaskQueueLibeventFactory();
+  return CreateTaskQueueStdlibFactory();
 }
 
 }  // namespace webrtc