Bug 1524688: Part 48 - Convert PresentationControlService to static registration. r=mconley

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

--HG--
rename : dom/presentation/provider/PresentationControlService.js => dom/presentation/provider/PresentationControlService.jsm
extra : rebase_source : 565933317ee4b3635f81aa2ff6e10da22052b1dd

browser/installer/package-manifest.in

@@ -232,9 +232,6 @@
 @RESPATH@/defaults/pref/marionette.js
 #endif
 
-@RESPATH@/components/BuiltinProviders.manifest
-@RESPATH@/components/PresentationControlService.js
-
 #if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
 @RESPATH@/components/TestInterfaceJS.js
 @RESPATH@/components/TestInterfaceJS.manifest

dom/presentation/provider/BuiltinProviders.manifest

@@ -1,2 +0,0 @@
-component {f4079b8b-ede5-4b90-a112-5b415a931deb} PresentationControlService.js
-contract @mozilla.org/presentation/control-service;1 {f4079b8b-ede5-4b90-a112-5b415a931deb}

dom/presentation/provider/PresentationControlService.jsm

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 const {clearTimeout, setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
@@ -947,4 +946,4 @@ TCPControlChannel.prototype = {
                                           Ci.nsIStreamListener]),
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PresentationControlService]); // jshint ignore:line
+var EXPORTED_SYMBOLS = ["PresentationControlService"];

dom/presentation/provider/components.conf

@@ -17,4 +17,10 @@ Classes = [
         'headers': ['/dom/presentation/provider/MulticastDNSDeviceProvider.h'],
         'categories': categories,
     },
+    {
+        'cid': '{f4079b8b-ede5-4b90-a112-5b415a931deb}',
+        'contract_ids': ['@mozilla.org/presentation/control-service;1'],
+        'jsm': 'resource://gre/modules/PresentationControlService.jsm',
+        'constructor': 'PresentationControlService',
+    },
 ]

dom/presentation/provider/moz.build

@@ -4,9 +4,8 @@
 # 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/.
 
-EXTRA_COMPONENTS += [
-    'BuiltinProviders.manifest',
-    'PresentationControlService.js'
+EXTRA_JS_MODULES += [
+    'PresentationControlService.jsm'
 ]
 
 UNIFIED_SOURCES += [

mobile/android/installer/package-manifest.in

@@ -150,8 +150,6 @@
 #endif
 
 #ifndef MOZ_GECKOVIEW_JAR
-@BINPATH@/components/BuiltinProviders.manifest
-@BINPATH@/components/PresentationControlService.js
 @BINPATH@/components/PresentationNetworkHelper.js
 @BINPATH@/components/PresentationNetworkHelper.manifest
 @BINPATH@/components/AndroidCastDeviceProvider.manifest