Backed out changeset 41bebff09700 (bug 1800033) for causing failures in browser_utility_audioDecodeCrash.js CLOSED TREE

ipc/glue/UtilityAudioDecoderParent.cpp

@@ -67,12 +67,12 @@ UtilityAudioDecoderParent::~UtilityAudioDecoderParent() {
 
 /* static */
 void UtilityAudioDecoderParent::GenericPreloadForSandbox() {
-#if defined(MOZ_SANDBOX) && defined(XP_WIN) && defined(MOZ_FFPVX)
+#if defined(MOZ_SANDBOX) && defined(OS_WIN)
   // Preload AV dlls so we can enable Binary Signature Policy
   // to restrict further dll loads.
   UtilityProcessImpl::LoadLibraryOrCrash(L"mozavcodec.dll");
   UtilityProcessImpl::LoadLibraryOrCrash(L"mozavutil.dll");
-#endif  // defined(MOZ_SANDBOX) && defined(XP_WIN) && defined(MOZ_FFPVX)
+#endif  // defined(MOZ_SANDBOX) && defined(OS_WIN)
 }
 
 /* static */