Bug 1524688: Part 34 - Convert gfx SanityTest to static registration. r=mattwoodrow

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

--HG--
rename : toolkit/components/gfx/SanityTest.js => toolkit/components/gfx/SanityTest.jsm
extra : source : f509a5759fdf1062844c10edf2c26da48b7424e1

browser/installer/package-manifest.in

@@ -511,12 +511,6 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
 @RESPATH@/gmp-clearkey/0.1/manifest.json
 
-; gfx
-#ifdef XP_WIN
-@RESPATH@/components/GfxSanityTest.manifest
-@RESPATH@/components/SanityTest.js
-#endif
-
 #ifdef MOZ_DMD
 ; DMD
 @RESPATH@/dmd.py

toolkit/components/gfx/GfxSanityTest.manifest

@@ -1,3 +0,0 @@
-component {f3a8ca4d-4c83-456b-aee2-6a2cbf11e9bd} SanityTest.js process=main
-contract @mozilla.org/sanity-test;1 {f3a8ca4d-4c83-456b-aee2-6a2cbf11e9bd} process=main
-category profile-after-change SanityTest @mozilla.org/sanity-test;1 process=main

toolkit/components/gfx/SanityTest.jsm

@@ -5,12 +5,10 @@
 "use strict";
 
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 ChromeUtils.defineModuleGetter(this, "AppConstants",
   "resource://gre/modules/AppConstants.jsm");
 
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const FRAME_SCRIPT_URL = "chrome://gfxsanity/content/gfxFrameScript.js";
 
 const PAGE_WIDTH = 160;
@@ -386,4 +384,4 @@ SanityTest.prototype = {
   },
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SanityTest]);
+var EXPORTED_SYMBOLS = ["SanityTest"];

toolkit/components/gfx/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': '{f3a8ca4d-4c83-456b-aee2-6a2cbf11e9bd}',
+        'contract_ids': ['@mozilla.org/sanity-test;1'],
+        'jsm': 'resource://gre/modules/SanityTest.jsm',
+        'constructor': 'SanityTest',
+        'processes': ProcessSelector.MAIN_PROCESS_ONLY,
+        'categories': {'profile-after-change': 'SanityTest'},
+    },
+]

toolkit/components/gfx/moz.build

@@ -7,9 +7,12 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Graphics')
 
-EXTRA_COMPONENTS += [
-    'GfxSanityTest.manifest',
-    'SanityTest.js',
+EXTRA_JS_MODULES += [
+    'SanityTest.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
 ]
 
 JAR_MANIFESTS += ['jar.mn']