From f4c7ab1bb24b2de856607428be2b5e2fd8fdf796 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Fri, 31 May 2019 17:03:27 +0200
Subject: [PATCH] in test/scenario pass TaskQueueFactory explicitly

instead of relying on factories that use GlobalTaskQueueFactory

Bug: webrtc:10284
Change-Id: Iafece5e83ccfd33499e9a473ea7e2e99d5c824c3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139522
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28150}
---
 test/scenario/network/BUILD.gn                |  8 ++---
 .../network/network_emulation_pc_unittest.cc  | 34 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/test/scenario/network/BUILD.gn b/test/scenario/network/BUILD.gn
index 35b0df43e8..339e441303 100644
--- a/test/scenario/network/BUILD.gn
+++ b/test/scenario/network/BUILD.gn
@@ -86,13 +86,11 @@ rtc_source_set("network_emulation_pc_unittest") {
     "../../../api:libjingle_peerconnection_api",
     "../../../api:scoped_refptr",
     "../../../api:simulated_network_api",
-    "../../../api/audio_codecs:builtin_audio_decoder_factory",
-    "../../../api/audio_codecs:builtin_audio_encoder_factory",
-    "../../../api/video_codecs:builtin_video_decoder_factory",
-    "../../../api/video_codecs:builtin_video_encoder_factory",
+    "../../../api/rtc_event_log:rtc_event_log_factory",
+    "../../../api/task_queue:default_task_queue_factory",
     "../../../call:simulated_network",
-    "../../../logging:rtc_event_log_impl_base",
     "../../../media:rtc_audio_video",
+    "../../../media:rtc_media_engine_defaults",
     "../../../modules/audio_device:audio_device_impl",
     "../../../p2p:rtc_p2p",
     "../../../pc:pc_test_utils",
diff --git a/test/scenario/network/network_emulation_pc_unittest.cc b/test/scenario/network/network_emulation_pc_unittest.cc
index 9799b89ee9..f9769bbc04 100644
--- a/test/scenario/network/network_emulation_pc_unittest.cc
+++ b/test/scenario/network/network_emulation_pc_unittest.cc
@@ -12,16 +12,14 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/call/call_factory_interface.h"
 #include "api/peer_connection_interface.h"
+#include "api/rtc_event_log/rtc_event_log_factory.h"
 #include "api/scoped_refptr.h"
-#include "api/video_codecs/builtin_video_decoder_factory.h"
-#include "api/video_codecs/builtin_video_encoder_factory.h"
+#include "api/task_queue/default_task_queue_factory.h"
 #include "call/simulated_network.h"
-#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/engine/webrtc_media_engine.h"
+#include "media/engine/webrtc_media_engine_defaults.h"
 #include "modules/audio_device/include/test_audio_device.h"
 #include "p2p/client/basic_port_allocator.h"
 #include "pc/peer_connection_wrapper.h"
@@ -56,20 +54,22 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
     rtc::Thread* signaling_thread,
     rtc::Thread* network_thread) {
   PeerConnectionFactoryDependencies pcf_deps;
-  pcf_deps.call_factory = webrtc::CreateCallFactory();
-  pcf_deps.event_log_factory = webrtc::CreateRtcEventLogFactory();
+  pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
+  pcf_deps.call_factory = CreateCallFactory();
+  pcf_deps.event_log_factory =
+      absl::make_unique<RtcEventLogFactory>(pcf_deps.task_queue_factory.get());
   pcf_deps.network_thread = network_thread;
   pcf_deps.signaling_thread = signaling_thread;
-  pcf_deps.media_engine = cricket::WebRtcMediaEngineFactory::Create(
-      TestAudioDeviceModule::CreateTestAudioDeviceModule(
-          TestAudioDeviceModule::CreatePulsedNoiseCapturer(kMaxAptitude,
-                                                           kSamplingFrequency),
-          TestAudioDeviceModule::CreateDiscardRenderer(kSamplingFrequency)),
-      webrtc::CreateBuiltinAudioEncoderFactory(),
-      webrtc::CreateBuiltinAudioDecoderFactory(),
-      webrtc::CreateBuiltinVideoEncoderFactory(),
-      webrtc::CreateBuiltinVideoDecoderFactory(), /*audio_mixer=*/nullptr,
-      webrtc::AudioProcessingBuilder().Create());
+  cricket::MediaEngineDependencies media_deps;
+  media_deps.task_queue_factory = pcf_deps.task_queue_factory.get();
+  media_deps.adm = TestAudioDeviceModule::Create(
+      media_deps.task_queue_factory,
+      TestAudioDeviceModule::CreatePulsedNoiseCapturer(kMaxAptitude,
+                                                       kSamplingFrequency),
+      TestAudioDeviceModule::CreateDiscardRenderer(kSamplingFrequency),
+      /*speed=*/1.f);
+  SetMediaEngineDefaults(&media_deps);
+  pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps));
   return CreateModularPeerConnectionFactory(std::move(pcf_deps));
 }