Bug 1770237: Part 8 - Remove legacy component registration for TestInterfaceJS. r=peterv

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

browser/installer/package-manifest.in

@@ -194,11 +194,6 @@
 @RESPATH@/chrome/remote.manifest
 #endif
 
-#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
-@RESPATH@/components/TestInterfaceJS.js
-@RESPATH@/components/TestInterfaceJS.manifest
-#endif
-
 ; [Extensions]
 @RESPATH@/components/extensions-toolkit.manifest
 @RESPATH@/browser/components/extensions-browser.manifest

dom/bindings/test/TestInterfaceJS.jsm

@@ -6,16 +6,13 @@
 
 "use strict";
 
-const { ComponentUtils } = ChromeUtils.import(
-  "resource://gre/modules/ComponentUtils.jsm"
-);
+var EXPORTED_SYMBOLS = ["TestInterfaceJS"];
+
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-function TestInterfaceJS(anyArg, objectArg) {}
+function TestInterfaceJS() {}
 
 TestInterfaceJS.prototype = {
-  classID: Components.ID("{2ac4e026-cf25-47d5-b067-78d553c3cad8}"),
-  contractID: "@mozilla.org/dom/test-interface-js;1",
   QueryInterface: ChromeUtils.generateQI([
     "nsIDOMGlobalPropertyInitializer",
     "mozITestInterfaceJS",
@@ -227,5 +224,3 @@ TestInterfaceJS.prototype = {
     this.__DOM_IMPL__.setEventHandler("onsomething", val);
   },
 };
-
-this.NSGetFactory = ComponentUtils.generateNSGetFactory([TestInterfaceJS]);

dom/bindings/test/TestInterfaceJS.manifest

@@ -1,2 +0,0 @@
-component {2ac4e026-cf25-47d5-b067-78d553c3cad8} TestInterfaceJS.js
-contract @mozilla.org/dom/test-interface-js;1 {2ac4e026-cf25-47d5-b067-78d553c3cad8}

dom/bindings/test/moz.build

@@ -12,11 +12,6 @@ DEFINES["MOZILLA_INTERNAL_API"] = True
 
 Library("dombindings_test_s")
 
-EXTRA_COMPONENTS += [
-    "TestInterfaceJS.js",
-    "TestInterfaceJS.manifest",
-]
-
 MOCHITEST_MANIFESTS += ["mochitest.ini"]
 
 MOCHITEST_CHROME_MANIFESTS += ["chrome.ini"]
@@ -27,6 +22,10 @@ TEST_WEBIDL_FILES += [
     "TestTypedef.webidl",
 ]
 
+TESTING_JS_MODULES += [
+    "TestInterfaceJS.jsm",
+]
+
 PREPROCESSED_TEST_WEBIDL_FILES += [
     "TestCodeGen.webidl",
     "TestExampleGen.webidl",

dom/webidl/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': '{2ac4e026-cf25-47d5-b067-78d553c3cad8}',
+        'contract_ids': ['@mozilla.org/dom/test-interface-js;1'],
+        'jsm': 'resource://testing-common/TestInterfaceJS.jsm',
+        'constructor': 'TestInterfaceJS',
+    },
+]
+

dom/webidl/moz.build

@@ -1112,6 +1112,9 @@ if CONFIG["MOZ_DEBUG"] and CONFIG["ENABLE_TESTS"]:
         "TestInterfaceJSMaplikeSetlikeIterable.webidl",
         "TestInterfaceObservableArray.webidl",
     ]
+    XPCOM_MANIFESTS += [
+        "components.conf",
+    ]
 
 WEBIDL_FILES += [
     "InstallTrigger.webidl",

mobile/android/installer/package-manifest.in

@@ -110,11 +110,6 @@
 @BINPATH@/components/servicesSettings.manifest
 @BINPATH@/components/l10n-registry.manifest
 
-#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
-@BINPATH@/components/TestInterfaceJS.js
-@BINPATH@/components/TestInterfaceJS.manifest
-#endif
-
 ; Modules
 @BINPATH@/modules/*
 @BINPATH@/actors/*