Backed out changeset 72bda4790c32 (bug 1933840) for causing bc failures @ browser_test_powerMetrics.js . CLOSED TREE

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<UtilityProcessManager> 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

ipc/glue/UtilityProcessManager.cpp

@@ -317,26 +317,6 @@ UtilityProcessManager::StartUtility(RefPtr<Actor> aActor,
       });
 }
 
-void UtilityProcessManager::StartProcessForRemoteMediaDecoding() {
-  RefPtr<UtilityAudioDecoderChild> genericUadc =
-      UtilityAudioDecoderChild::GetSingleton(SandboxingKind::GENERIC_UTILITY);
-  StartUtility(genericUadc, SandboxingKind::GENERIC_UTILITY);
-
-#ifdef MOZ_APPLEMEDIA
-  RefPtr<UtilityAudioDecoderChild> appleUadc =
-      UtilityAudioDecoderChild::GetSingleton(
-          SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA);
-  StartUtility(appleUadc, SandboxingKind::UTILITY_AUDIO_DECODING_APPLE_MEDIA);
-#endif
-
-#ifdef XP_WIN
-  RefPtr<UtilityAudioDecoderChild> wmfUadc =
-      UtilityAudioDecoderChild::GetSingleton(
-          SandboxingKind::UTILITY_AUDIO_DECODING_WMF);
-  StartUtility(wmfUadc, SandboxingKind::UTILITY_AUDIO_DECODING_WMF);
-#endif
-}
-
 RefPtr<UtilityProcessManager::StartRemoteDecodingUtilityPromise>
 UtilityProcessManager::StartProcessForRemoteMediaDecoding(
     EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId,

ipc/glue/UtilityProcessManager.h

@@ -64,9 +64,6 @@ class UtilityProcessManager final : public UtilityProcessHost::Listener {
   RefPtr<LaunchPromise<Ok>> StartUtility(RefPtr<Actor> aActor,
                                          SandboxingKind aSandbox);
 
-  // Launch Utility processes for media decoding.
-  void StartProcessForRemoteMediaDecoding();
-
   RefPtr<StartRemoteDecodingUtilityPromise> StartProcessForRemoteMediaDecoding(
       EndpointProcInfo aOtherProcess, dom::ContentParentId aChildId,
       SandboxingKind aSandbox);