Bug 1524688: Part 22 - Convert URLFormatter to static registration. r=aswan

--HG--
rename : toolkit/components/urlformatter/nsURLFormatter.js => toolkit/components/urlformatter/URLFormatter.jsm
extra : rebase_source : 98e7e8c3604314560abde8c80badb2140a8e0e34

browser/installer/package-manifest.in

@@ -214,8 +214,6 @@
 @RESPATH@/components/nsUpdateTimerManager.manifest
 @RESPATH@/components/nsUpdateTimerManager.js
 @RESPATH@/components/ProcessSingleton.manifest
-@RESPATH@/components/nsURLFormatter.manifest
-@RESPATH@/components/nsURLFormatter.js
 @RESPATH@/components/PageThumbsStorageService.js
 @RESPATH@/components/mozProtocolHandler.js
 @RESPATH@/components/mozProtocolHandler.manifest

mobile/android/installer/package-manifest.in

@@ -151,8 +151,6 @@
 @BINPATH@/components/nsUpdateTimerManager.js
 
 @BINPATH@/components/ProcessSingleton.manifest
-@BINPATH@/components/nsURLFormatter.manifest
-@BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/ContentPrefService2.manifest
 @BINPATH@/components/ContentPrefService2.js
 @BINPATH@/components/HandlerService.manifest

toolkit/components/urlformatter/URLFormatter.jsm

@@ -133,4 +133,4 @@ nsURLFormatterService.prototype = {
   },
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsURLFormatterService]);
+var EXPORTED_SYMBOLS = ["nsURLFormatterService"];

toolkit/components/urlformatter/components.conf

@@ -0,0 +1,14 @@
+# -*- 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': '{e6156350-2be8-11db-a98b-0800200c9a66}',
+        'contract_ids': ['@mozilla.org/toolkit/URLFormatterService;1'],
+        'jsm': 'resource://gre/modules/URLFormatter.jsm',
+        'constructor': 'nsURLFormatterService',
+    },
+]

toolkit/components/urlformatter/moz.build

@@ -15,9 +15,12 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'urlformatter'
 
-EXTRA_COMPONENTS += [
-    'nsURLFormatter.js',
-    'nsURLFormatter.manifest',
+EXTRA_JS_MODULES += [
+    'URLFormatter.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
 ]
 
 DEFINES['OBJDIR'] = OBJDIR

toolkit/components/urlformatter/nsURLFormatter.manifest

@@ -1,2 +0,0 @@
-component {e6156350-2be8-11db-a98b-0800200c9a66} nsURLFormatter.js
-contract @mozilla.org/toolkit/URLFormatterService;1 {e6156350-2be8-11db-a98b-0800200c9a66}