Bug 1524688: Part 26 - Convert TerminatorTelemetry to static registration. r=froydnj

--HG--
rename : toolkit/components/terminator/nsTerminatorTelemetry.js => toolkit/components/terminator/TerminatorTelemetry.jsm
extra : source : fe583e7aae8d620c45a4a3638dea4d602d59e513

browser/installer/package-manifest.in

@@ -508,7 +508,6 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; Shutdown Terminator
-@RESPATH@/components/nsTerminatorTelemetry.js
 @RESPATH@/components/terminator.manifest
 
 #ifdef LLVM_SYMBOLIZER

toolkit/components/terminator/TerminatorTelemetry.jsm

@@ -91,4 +91,4 @@ nsTerminatorTelemetry.prototype = {
 
 // Module
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsTerminatorTelemetry]);
+var EXPORTED_SYMBOLS = ["nsTerminatorTelemetry"];

toolkit/components/terminator/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': '{3f78ada1-cba2-442a-82dd-d5fb300ddea7}',
+        'contract_ids': ['@mozilla.org/toolkit/shutdown-terminator-telemetry;1'],
+        'jsm': 'resource://gre/modules/TerminatorTelemetry.jsm',
+        'constructor': 'nsTerminatorTelemetry',
+        'categories': {'profile-after-change': 'nsTerminatorTelemetry'},
+    },
+]

toolkit/components/terminator/moz.build

@@ -18,8 +18,15 @@ EXPORTS += [
 ]
 
 EXTRA_COMPONENTS += [
-    'nsTerminatorTelemetry.js',
     'terminator.manifest',
 ]
 
+EXTRA_JS_MODULES += [
+    'TerminatorTelemetry.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
+]
+
 FINAL_LIBRARY = 'xul'

toolkit/components/terminator/terminator.manifest

@@ -1,5 +1 @@
 category profile-after-change nsTerminator @mozilla.org/toolkit/shutdown-terminator;1
-
-component {3f78ada1-cba2-442a-82dd-d5fb300ddea7} nsTerminatorTelemetry.js
-contract @mozilla.org/toolkit/shutdown-terminator-telemetry;1 {3f78ada1-cba2-442a-82dd-d5fb300ddea7}
-category profile-after-change nsTerminatorTelemetry @mozilla.org/toolkit/shutdown-terminator-telemetry;1