Bug 1524688: Part 50 - Convert PresentationNetworkHelper to static registration. r=mconley

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

--HG--
rename : dom/presentation/PresentationNetworkHelper.js => dom/presentation/PresentationNetworkHelper.jsm
extra : source : 183602e8a30b527608f2c862601abd83f275e636

dom/presentation/PresentationNetworkHelper.jsm

@@ -6,14 +6,10 @@
 "use strict";
 
 const {EventDispatcher} = ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const NETWORKHELPER_CID = Components.ID("{5fb96caa-6d49-4f6b-9a4b-65dd0d51f92d}");
 
 function PresentationNetworkHelper() {}
 
 PresentationNetworkHelper.prototype = {
-  classID: NETWORKHELPER_CID,
   QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationNetworkHelper]),
 
   getWifiIPAddress(aListener) {
@@ -23,4 +19,4 @@ PresentationNetworkHelper.prototype = {
   },
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PresentationNetworkHelper]);
+var EXPORTED_SYMBOLS = ["PresentationNetworkHelper"];

dom/presentation/PresentationNetworkHelper.manifest

@@ -1,3 +0,0 @@
-# PresentationNetworkHelper.js
-component {5fb96caa-6d49-4f6b-9a4b-65dd0d51f92d} PresentationNetworkHelper.js
-contract @mozilla.org/presentation-device/networkHelper;1 {5fb96caa-6d49-4f6b-9a4b-65dd0d51f92d}

dom/presentation/components.conf

@@ -18,3 +18,13 @@ Classes = [
         'constructor': 'PresentationTransportBuilder',
     },
 ]
+
+if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'android':
+    Classes += [
+        {
+            'cid': '{5fb96caa-6d49-4f6b-9a4b-65dd0d51f92d}',
+            'contract_ids': ['@mozilla.org/presentation-device/networkHelper;1'],
+            'jsm': 'resource://gre/modules/PresentationNetworkHelper.jsm',
+            'constructor': 'PresentationNetworkHelper',
+        },
+    ]

dom/presentation/moz.build

@@ -69,9 +69,8 @@ XPCOM_MANIFESTS += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    EXTRA_COMPONENTS += [
-        'PresentationNetworkHelper.js',
-        'PresentationNetworkHelper.manifest',
+    EXTRA_JS_MODULES += [
+        'PresentationNetworkHelper.jsm',
     ]
 
 IPDL_SOURCES += [

mobile/android/installer/package-manifest.in

@@ -149,11 +149,6 @@
 @BINPATH@/components/TestInterfaceJSMaplike.js
 #endif
 
-#ifndef MOZ_GECKOVIEW_JAR
-@BINPATH@/components/PresentationNetworkHelper.js
-@BINPATH@/components/PresentationNetworkHelper.manifest
-#endif
-
 ; Modules
 @BINPATH@/modules/*
 @BINPATH@/actors/*