Bug 1375077 - Change app update timer to shut down at profile-before-change instead of xpcom-shutdown, r=rstrong

MozReview-Commit-ID: FVTT9Chtvmf

--HG--
extra : rebase_source : d51ea09815395af4431ccf96b814a7f8a05eac03
extra : source : 5856f1c45a92e1f8d8d4cc588bc5510b1d29bf89

toolkit/components/timermanager/nsUpdateTimerManager.js

@@ -57,7 +57,7 @@ function LOG(string) {
  *  @constructor
  */
 function TimerManager() {
-  Services.obs.addObserver(this, "xpcom-shutdown");
+  Services.obs.addObserver(this, "profile-before-change");
 }
 TimerManager.prototype = {
   /**
@@ -109,8 +109,8 @@ TimerManager.prototype = {
         this._canEnsureTimer = true;
         this._ensureTimer(firstInterval);
         break;
-      case "xpcom-shutdown":
-        Services.obs.removeObserver(this, "xpcom-shutdown");
+      case "profile-before-change":
+        Services.obs.removeObserver(this, "profile-before-change");
 
         // Release everything we hold onto.
         this._cancelTimer();

toolkit/components/timermanager/tests/unit/consumerNotifications.js

@@ -348,7 +348,7 @@ function run_test() {
 }
 
 function end_test() {
-  gUTM.observe(null, "xpcom-shutdown", "");
+  gUTM.observe(null, "profile-before-change", "");
   do_test_finished();
 }