Bug 1524688: Part 37 - Convert CrashService to static registration. r=mconley

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

--HG--
rename : toolkit/components/crashes/CrashService.js => toolkit/components/crashes/CrashService.jsm
extra : rebase_source : 735bf5e5a28d832de4222e7d814acf4fa6912a75

browser/installer/package-manifest.in

@@ -465,8 +465,6 @@ bin/libfreebl_32int64_3.so
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
-@RESPATH@/components/CrashService.manifest
-@RESPATH@/components/CrashService.js
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else

toolkit/components/crashes/CrashService.jsm

@@ -8,9 +8,7 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm", this);
 ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm", this);
 const {parseKeyValuePairs} = ChromeUtils.import("resource://gre/modules/KeyValueParser.jsm");
 ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm", this);
 ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
 
 // Set to true if the application is quitting
 var gQuitting = false;
@@ -263,4 +261,4 @@ CrashService.prototype = Object.freeze({
   },
 });
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([CrashService]);
+var EXPORTED_SYMBOLS = ["CrashService"];

toolkit/components/crashes/CrashService.manifest

@@ -1,3 +0,0 @@
-component {92668367-1b17-4190-86b2-1061b2179744} CrashService.js
-contract @mozilla.org/crashservice;1 {92668367-1b17-4190-86b2-1061b2179744}
-category profile-after-change CrashService @mozilla.org/crashservice;1

toolkit/components/crashes/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': '{92668367-1b17-4190-86b2-1061b2179744}',
+        'contract_ids': ['@mozilla.org/crashservice;1'],
+        'jsm': 'resource://gre/modules/CrashService.jsm',
+        'constructor': 'CrashService',
+        'categories': {'profile-after-change': 'CrashService'},
+    },
+]

toolkit/components/crashes/moz.build

@@ -16,13 +16,13 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_CRASHREPORTER']:
-    EXTRA_COMPONENTS += [
-        'CrashService.js',
-        'CrashService.manifest',
-    ]
-
     EXTRA_JS_MODULES += [
         'CrashManager.jsm',
+        'CrashService.jsm',
+    ]
+
+    XPCOM_MANIFESTS += [
+        'components.conf',
     ]
 
     TESTING_JS_MODULES += [