Backed out changeset be43a81b35f9 (bug 1689953) for causing failure at test_terminator_record.js. CLOSED TREE

Author: Butkovits Atila

accessible/ipc/win/DocAccessibleChild.cpp

@@ -22,7 +22,7 @@ DocAccessibleChild::DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
   MOZ_COUNT_CTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
   if (!sPlatformChild) {
     sPlatformChild = new PlatformChild();
-    ClearOnShutdown(&sPlatformChild, ShutdownPhase::XPCOMShutdown);
+    ClearOnShutdown(&sPlatformChild, ShutdownPhase::Shutdown);
   }
 
   SetManager(aManager);

browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js

@@ -28,7 +28,7 @@ async function fake_profile_change() {
     }, "cookie-db-closed");
     Services.cookies
       .QueryInterface(Ci.nsIObserver)
-      .observe(null, "profile-before-change", null);
+      .observe(null, "profile-before-change", "shutdown-persist");
   });
   await new Promise(resolve => {
     Services.obs.addObserver(function waitForDBOpen() {

dom/ipc/ContentChild.cpp

@@ -575,7 +575,7 @@ ContentChild::ContentChild()
   // happens without requiring the observer service at this time.
   if (!sShutdownCanary) {
     sShutdownCanary = new ShutdownCanary();
-    ClearOnShutdown(&sShutdownCanary, ShutdownPhase::XPCOMShutdown);
+    ClearOnShutdown(&sShutdownCanary, ShutdownPhase::Shutdown);
   }
 }
 

dom/ipc/ContentParent.cpp

@@ -2839,7 +2839,7 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
   // can't init the process without it, and since we're going to be canceling
   // whatever load attempt that initiated this process creation anyway, just
   // bail out now if shutdown has already started.
-  if (PastShutdownPhase(ShutdownPhase::XPCOMShutdown)) {
+  if (PastShutdownPhase(ShutdownPhase::Shutdown)) {
     return false;
   }
 

dom/media/MediaCache.cpp

@@ -773,7 +773,7 @@ RefPtr<MediaCache> MediaCache::GetMediaCache(int64_t aContentLength,
         thread->Shutdown();
       }
     } sClearThread;
-    ClearOnShutdown(&sClearThread, ShutdownPhase::XPCOMShutdownThreads);
+    ClearOnShutdown(&sClearThread, ShutdownPhase::ShutdownThreads);
   }
 
   if (!sThread) {

dom/media/doctor/DecoderDoctorLogger.cpp

@@ -116,11 +116,9 @@ bool DecoderDoctorLogger::EnsureLogIsEnabled() {
               TaskCategory::Other,
               NS_NewRunnableFunction("DDLogger shutdown setup", [] {
                 sDDLogShutdowner = MakeUnique<DDLogShutdowner>();
-                ClearOnShutdown(&sDDLogShutdowner,
-                                ShutdownPhase::XPCOMShutdown);
+                ClearOnShutdown(&sDDLogShutdowner, ShutdownPhase::Shutdown);
                 sDDLogDeleter = MakeUnique<DDLogDeleter>();
-                ClearOnShutdown(&sDDLogDeleter,
-                                ShutdownPhase::XPCOMShutdownThreads);
+                ClearOnShutdown(&sDDLogDeleter, ShutdownPhase::ShutdownThreads);
               })));
 
           // Nobody else should change the state when *we* are enabling logging.

dom/media/mediacapabilities/MediaCapabilities.cpp

@@ -257,7 +257,7 @@ already_AddRefed<Promise> MediaCapabilities::DecodingInfo(
                 NS_NewRunnableFunction(
                     "MediaCapabilities::AllocPolicy:Video", []() {
                       ClearOnShutdown(&sVideoAllocPolicy,
-                                      ShutdownPhase::XPCOMShutdownThreads);
+                                      ShutdownPhase::ShutdownThreads);
                     }));
             return new SingleAllocPolicy(TrackInfo::TrackType::kVideoTrack,
                                          taskQueue);

dom/media/platforms/AllocationPolicy.cpp

@@ -97,8 +97,7 @@ NotNull<AllocPolicy*> GlobalAllocPolicy::Instance(TrackType aTrack) {
           TaskCategory::Other,
           NS_NewRunnableFunction(
               "GlobalAllocPolicy::GlobalAllocPolicy:Audio", []() {
-                ClearOnShutdown(&sAudioPolicy,
-                                ShutdownPhase::XPCOMShutdownThreads);
+                ClearOnShutdown(&sAudioPolicy, ShutdownPhase::ShutdownThreads);
               }));
       return new AllocPolicyImpl(MediaDecoderLimitDefault());
     }();
@@ -109,8 +108,7 @@ NotNull<AllocPolicy*> GlobalAllocPolicy::Instance(TrackType aTrack) {
         TaskCategory::Other,
         NS_NewRunnableFunction(
             "GlobalAllocPolicy::GlobalAllocPolicy:Audio", []() {
-              ClearOnShutdown(&sVideoPolicy,
-                              ShutdownPhase::XPCOMShutdownThreads);
+              ClearOnShutdown(&sVideoPolicy, ShutdownPhase::ShutdownThreads);
             }));
     return new AllocPolicyImpl(MediaDecoderLimitDefault());
   }();

dom/media/webrtc/CubebDeviceEnumerator.cpp

@@ -30,7 +30,7 @@ CubebDeviceEnumerator* CubebDeviceEnumerator::GetInstance() {
     sInstance = new CubebDeviceEnumerator();
     static bool clearOnShutdownSetup = []() -> bool {
       auto setClearOnShutdown = []() -> void {
-        ClearOnShutdown(&sInstance, ShutdownPhase::XPCOMShutdownThreads);
+        ClearOnShutdown(&sInstance, ShutdownPhase::ShutdownThreads);
       };
       if (NS_IsMainThread()) {
         setClearOnShutdown();

dom/media/webrtc/transport/nr_socket_prsock.cpp

@@ -241,7 +241,7 @@ class SingletonThreadHolder final {
 static StaticRefPtr<SingletonThreadHolder> sThread;
 
 static void ClearSingletonOnShutdown() {
-  ClearOnShutdown(&sThread, ShutdownPhase::XPCOMShutdownLoaders);
+  ClearOnShutdown(&sThread, ShutdownPhase::ShutdownLoaders);
 }
 #endif