Bug 1524688: Part 24 - Convert UpdateTimerManager to static registration. r=aswan

--HG--
rename : toolkit/components/timermanager/nsUpdateTimerManager.js => toolkit/components/timermanager/UpdateTimerManager.jsm
extra : source : f4eaebbe2e0f424d9063dae50158bf53cb32781f

browser/installer/package-manifest.in

@@ -209,8 +209,6 @@
 #ifdef MOZ_UPDATER
 @RESPATH@/components/nsUpdateService.manifest
 #endif
-@RESPATH@/components/nsUpdateTimerManager.manifest
-@RESPATH@/components/nsUpdateTimerManager.js
 @RESPATH@/components/ProcessSingleton.manifest
 @RESPATH@/components/PageThumbsStorageService.js
 @RESPATH@/components/mozProtocolHandler.js

mobile/android/installer/package-manifest.in

@@ -145,9 +145,6 @@
 @BINPATH@/components/ClearDataService.manifest
 @BINPATH@/components/ClearDataService.js
 
-@BINPATH@/components/nsUpdateTimerManager.manifest
-@BINPATH@/components/nsUpdateTimerManager.js
-
 @BINPATH@/components/ProcessSingleton.manifest
 @BINPATH@/components/ContentPrefService2.manifest
 @BINPATH@/components/ContentPrefService2.js

toolkit/components/timermanager/UpdateTimerManager.jsm

@@ -330,4 +330,4 @@ TimerManager.prototype = {
                                           Ci.nsIObserver]),
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TimerManager]);
+var EXPORTED_SYMBOLS = ["TimerManager"];

toolkit/components/timermanager/components.conf

@@ -0,0 +1,15 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+Classes = [
+    {
+        'cid': '{B322A5C0-A419-484E-96BA-D7182163899F}',
+        'contract_ids': ['@mozilla.org/updates/timer-manager;1'],
+        'jsm': 'resource://gre/modules/UpdateTimerManager.jsm',
+        'constructor': 'TimerManager',
+        'categories': {'profile-after-change': 'nsUpdateTimerManager'},
+    },
+]

toolkit/components/timermanager/moz.build

@@ -12,9 +12,12 @@ XPIDL_SOURCES += [
     'nsIUpdateTimerManager.idl',
 ]
 
-EXTRA_COMPONENTS += [
-    'nsUpdateTimerManager.js',
-    'nsUpdateTimerManager.manifest',
+EXTRA_JS_MODULES += [
+    'UpdateTimerManager.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
 ]
 
 with Files('**'):

toolkit/components/timermanager/nsUpdateTimerManager.manifest

@@ -1,3 +0,0 @@
-component {B322A5C0-A419-484E-96BA-D7182163899F} nsUpdateTimerManager.js
-contract @mozilla.org/updates/timer-manager;1 {B322A5C0-A419-484E-96BA-D7182163899F}
-category profile-after-change nsUpdateTimerManager @mozilla.org/updates/timer-manager;1