Bug 1180921 - Create a dumping ground for simple services in toolkit/components/utils. r=Gijs

browser/installer/package-manifest.in

@@ -436,7 +436,8 @@
 @RESPATH@/components/addoncompat.manifest
 @RESPATH@/components/multiprocessShims.js
 @RESPATH@/components/defaultShims.js
-@RESPATH@/components/remoteTagService.js
+@RESPATH@/components/utils.manifest
+@RESPATH@/components/simpleServices.js
 @RESPATH@/components/pluginGlue.manifest
 @RESPATH@/components/ProcessSingleton.manifest
 @RESPATH@/components/MainProcessSingleton.js

toolkit/components/addoncompat/addoncompat.manifest

@@ -2,5 +2,3 @@ component {1363d5f0-d95e-11e3-9c1a-0800200c9a66} multiprocessShims.js
 contract @mozilla.org/addons/multiprocess-shims;1 {1363d5f0-d95e-11e3-9c1a-0800200c9a66}
 component {50bc93ce-602a-4bef-bf3a-61fc749c4caf} defaultShims.js
 contract @mozilla.org/addons/default-addon-shims;1 {50bc93ce-602a-4bef-bf3a-61fc749c4caf}
-component {dfd07380-6083-11e4-9803-0800200c9a66} remoteTagService.js
-contract @mozilla.org/addons/remote-tag-service;1 {dfd07380-6083-11e4-9803-0800200c9a66}

toolkit/components/addoncompat/moz.build

@@ -10,7 +10,6 @@ EXTRA_COMPONENTS += [
     'addoncompat.manifest',
     'defaultShims.js',
     'multiprocessShims.js',
-    'remoteTagService.js',
 ]
 
 EXTRA_JS_MODULES += [

toolkit/components/moz.build

@@ -50,6 +50,7 @@ DIRS += [
     'thumbnails',
     'timermanager',
     'typeaheadfind',
+    'utils',
     'urlformatter',
     'viewconfig',
     'workerloader',

toolkit/components/utils/moz.build

@@ -0,0 +1,10 @@
+# -*- Mode: python; c-basic-offset: 4; 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/.
+
+EXTRA_COMPONENTS += [
+    'simpleServices.js',
+    'utils.manifest',
+]

toolkit/components/utils/simpleServices.js

@@ -2,6 +2,14 @@
  * 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/. */
 
+/*
+ * Dumping ground for simple services for which the isolation of a full global
+ * is overkill. Be careful about namespace pollution, and be mindful about
+ * importing lots of JSMs in global scope, since this file will almost certainly
+ * be loaded from enough callsites that any such imports will always end up getting
+ * eagerly loaded at startup.
+ */
+
 "use strict";
 
 const Cu = Components.utils;

toolkit/components/utils/utils.manifest

@@ -0,0 +1,2 @@
+component {dfd07380-6083-11e4-9803-0800200c9a66} simpleServices.js
+contract @mozilla.org/addons/remote-tag-service;1 {dfd07380-6083-11e4-9803-0800200c9a66}