diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 35faf0c13459..620834c23aa0 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -151,7 +151,6 @@ #include "mozilla/ipc/Endpoint.h" #include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/ipc/IPCStreamUtils.h" -#include "mozilla/ipc/UtilityProcessManager.h" #include "mozilla/ipc/SharedMemory.h" #include "mozilla/ipc/TestShellParent.h" #include "mozilla/layers/CompositorThread.h" @@ -2972,12 +2971,6 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) { rdd->LaunchRDDProcess(); } - if (StaticPrefs::media_utility_process_enabled()) { - // Ensure the Utility media processes have been started. - RefPtr upm = UtilityProcessManager::GetSingleton(); - upm->StartProcessForRemoteMediaDecoding(); - } - nsStyleSheetService* sheetService = nsStyleSheetService::GetInstance(); if (sheetService) { // This looks like a lot of work, but in a normal browser session we just diff --git a/ipc/glue/UtilityProcessManager.cpp b/ipc/glue/UtilityProcessManager.cpp index 897e9e759006..b8c28cbfcc29 100644 --- a/ipc/glue/UtilityProcessManager.cpp +++ b/ipc/glue/UtilityProcessManager.cpp @@ -317,26 +317,6 @@ UtilityProcessManager::StartUtility(RefPtr aActor, }); } -void UtilityProcessManager::StartProcessForRemoteMediaDecoding() { - RefPtr genericUadc = - UtilityAudioDecoderChild::GetSingleton(SandboxingKind::GENERIC_UTILITY); - StartUtility(genericUadc, SandboxingKind::GENERIC_UTILITY); - -#ifdef MOZ_APPLEMEDIA - RefPtr appleUadc = - UtilityAudioDecoderChild::GetSingleton( - SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA); - StartUtility(appleUadc, SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA); -#endif - -#ifdef XP_WIN - RefPtr wmfUadc = - UtilityAudioDecoderChild::GetSingleton( - SandboxingKind::UTILITY_AUDIO_DECODING_WMF); - StartUtility(wmfUadc, SandboxingKind::UTILITY_AUDIO_DECODING_WMF); -#endif -} - RefPtr UtilityProcessManager::StartProcessForRemoteMediaDecoding( EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId, diff --git a/ipc/glue/UtilityProcessManager.h b/ipc/glue/UtilityProcessManager.h index 22f98b566c87..610668724d19 100644 --- a/ipc/glue/UtilityProcessManager.h +++ b/ipc/glue/UtilityProcessManager.h @@ -64,9 +64,6 @@ class UtilityProcessManager final : public UtilityProcessHost::Listener { RefPtr> StartUtility(RefPtr aActor, SandboxingKind aSandbox); - // Launch Utility processes for media decoding. - void StartProcessForRemoteMediaDecoding(); - RefPtr StartProcessForRemoteMediaDecoding( EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId, SandboxingKind aSandbox);