Bug 1524688: Part 41 - Convert BHRTelemetry to static registration. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D18451

--HG--
rename : toolkit/components/backgroundhangmonitor/BHRTelemetryService.js => toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm
extra : rebase_source : 4b28e6ee2270edc50492d9a0fea9d5e021855675

browser/installer/package-manifest.in

@@ -510,13 +510,6 @@ bin/libfreebl_32int64_3.so
 #endif
 #endif
 
-; NOTE: This must match the config checks in
-; /toolkit/components/backgroundhangmonitor/moz.build.
-#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN) && !defined(MOZ_ASAN)
-@RESPATH@/components/BHRTelemetryService.js
-@RESPATH@/components/BHRTelemetryService.manifest
-#endif
-
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif

mobile/android/installer/package-manifest.in

@@ -305,10 +305,3 @@
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
-
-; NOTE: This must match the config checks in
-; /toolkit/components/backgroundhangmonitor/moz.build.
-#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN) && !defined(MOZ_ASAN)
-@BINPATH@/components/BHRTelemetryService.js
-@BINPATH@/components/BHRTelemetryService.manifest
-#endif

toolkit/components/backgroundhangmonitor/BHRTelemetryService.jsm

@@ -4,7 +4,6 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
 ChromeUtils.import("resource://gre/modules/Services.jsm", this);
 
 ChromeUtils.defineModuleGetter(this, "TelemetryController",
@@ -123,4 +122,4 @@ BHRTelemetryService.prototype = Object.freeze({
   },
 });
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([BHRTelemetryService]);
+var EXPORTED_SYMBOLS = ["BHRTelemetryService"];

toolkit/components/backgroundhangmonitor/BHRTelemetryService.manifest

@@ -1,3 +0,0 @@
-component {117c8cdf-69e6-4f31-a439-b8a654c67127} BHRTelemetryService.js process=main
-contract @mozilla.org/bhr-telemetry-service;1 {117c8cdf-69e6-4f31-a439-b8a654c67127} process=main
-category profile-after-change BHRTelemetryService @mozilla.org/bhr-telemetry-service;1 process=main

toolkit/components/backgroundhangmonitor/components.conf

@@ -0,0 +1,16 @@
+# -*- 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': '{117c8cdf-69e6-4f31-a439-b8a654c67127}',
+        'contract_ids': ['@mozilla.org/bhr-telemetry-service;1'],
+        'jsm': 'resource://gre/modules/BHRTelemetryService.jsm',
+        'constructor': 'BHRTelemetryService',
+        'categories': {'profile-after-change': 'BHRTelemetryService'},
+        'processes': ProcessSelector.MAIN_PROCESS_ONLY,
+    },
+]

toolkit/components/backgroundhangmonitor/moz.build

@@ -18,9 +18,12 @@ if CONFIG['NIGHTLY_BUILD'] and \
    not CONFIG['MOZ_ASAN']:
     DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
 
-    EXTRA_COMPONENTS += [
-        'BHRTelemetryService.js',
-        'BHRTelemetryService.manifest',
+    EXTRA_JS_MODULES += [
+        'BHRTelemetryService.jsm',
+    ]
+
+    XPCOM_MANIFESTS += [
+        'components.conf',
     ]
 
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']