diff -r 000000000000 -r 6474c204b198 dom/push/src/PushServiceLauncher.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/push/src/PushServiceLauncher.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const Cr = Components.results;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+function PushServiceLauncher() {
+};
+
+PushServiceLauncher.prototype = {
+  classID: Components.ID("{4b8caa3b-3c58-4f3c-a7f5-7bd9cb24c11d}"),
+
+  contractID: "@mozilla.org/push/ServiceLauncher;1",
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                         Ci.nsISupportsWeakReference]),
+
+  observe: function observe(subject, topic, data) {
+    switch (topic) {
+      case "app-startup":
+        Services.obs.addObserver(this, "final-ui-startup", true);
+        break;
+      case "final-ui-startup":
+        Services.obs.removeObserver(this, "final-ui-startup");
+        if (!Services.prefs.getBoolPref("services.push.enabled")) {
+          return;
+        }
+        Cu.import("resource://gre/modules/PushService.jsm");
+        PushService.init();
+        break;
+    }
+  }
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PushServiceLauncher]);