Backed out changeset 3b0d1e17cad0 (bug 1055408) for bustage

content/media/gmp/GMPParent.cpp

@@ -161,12 +161,6 @@ GMPParent::CloseIfUnused()
       mVideoEncoders.IsEmpty() &&
       mDecryptors.IsEmpty() &&
       mAudioDecoders.IsEmpty()) {
-
-    // Ensure all timers are killed.
-    for (uint32_t i = mTimers.Length(); i > 0; i--) {
-      mTimers[i - 1]->Shutdown();
-    }
-
     if (mAsyncShutdownRequired) {
       if (!mAsyncShutdownInProgress) {
         LOGD(("%s::%s: %p sending async shutdown notification", __CLASS__,
@@ -240,8 +234,9 @@ GMPParent::CloseActive(bool aDieWhenUnloaded)
     mAudioDecoders[i - 1]->Shutdown();
   }
 
-  // Note: we don't shutdown timers here, we do that in CloseIfUnused(),
-  // as there are multiple entry points to CloseIfUnused().
+  for (uint32_t i = mTimers.Length(); i > 0; i--) {
+    mTimers[i - 1]->Shutdown();
+  }
 
   // Note: We don't shutdown storage API objects here, as they need to
   // work during async shutdown of GMPs.