Bug 1320084 - Remove useless devtools JSM shims. r=jryans draft
authorAlexandre Poirot <poirot.alex@gmail.com>
Thu, 24 Nov 2016 10:31:38 -0800
changeset 455275 45a688402768a23d3576a29b32676b185dcaa3f3
parent 455274 76854066832a84fd46c76b0b0c8d841247b9b390
child 540939 ab4cf4861a62c735a96fd69c2c59740d2c459e87
push id40184
push userbmo:poirot.alex@gmail.com
push dateTue, 03 Jan 2017 11:24:54 +0000
reviewersjryans
bugs1320084
milestone53.0a1
Bug 1320084 - Remove useless devtools JSM shims. r=jryans MozReview-Commit-ID: JUui79wiNYi
devtools/client/shims/moz.build
devtools/shared/apps/moz.build
devtools/shared/shims/Simulator.jsm
devtools/shared/shims/moz.build
--- a/devtools/client/shims/moz.build
+++ b/devtools/client/shims/moz.build
@@ -6,13 +6,8 @@
 
 # Unlike most DevTools build files, this file does not use DevToolsModules
 # because these files are here for add-on compatibility, and so they must be
 # installed to previously defined locations.
 
 EXTRA_JS_MODULES.devtools += [
     'gDevTools.jsm',
 ]
-
-# Extra compatibility layer for transitional URLs used for part of 44 cycle
-EXTRA_JS_MODULES.devtools.client.framework += [
-    'gDevTools.jsm',
-]
--- a/devtools/shared/apps/moz.build
+++ b/devtools/shared/apps/moz.build
@@ -1,10 +1,9 @@
 # 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/.
 
 DevToolsModules(
     'app-actor-front.js',
-    'Devices.jsm',
-    'Simulator.jsm'
+    'Devices.jsm'
 )
deleted file mode 100644
--- a/devtools/shared/shims/Simulator.jsm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-/**
- * This file only exists to support add-ons which import this module at a
- * specific path.
- */
-
-const Cu = Components.utils;
-
-const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-
-const WARNING_PREF = "devtools.migration.warnings";
-if (Services.prefs.getBoolPref(WARNING_PREF)) {
-  const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {});
-  Deprecated.warning("This path to Simulator.jsm is deprecated.  Please use " +
-                     "Cu.import(\"resource://devtools/shared/" +
-                     "apps/Simulator.jsm\") to load this module.",
-                     "https://bugzil.la/912121");
-}
-
-this.EXPORTED_SYMBOLS = [
-  "Simulator",
-];
-
-const module =
-  Cu.import("resource://devtools/shared/apps/Simulator.jsm", {});
-
-for (let symbol of this.EXPORTED_SYMBOLS) {
-  this[symbol] = module[symbol];
-}
--- a/devtools/shared/shims/moz.build
+++ b/devtools/shared/shims/moz.build
@@ -12,20 +12,14 @@
 # /toolkit modules.  Disable any DIST_SUBDIR from parent files here.
 DIST_SUBDIR = ''
 
 EXTRA_JS_MODULES.devtools += [
     'Console.jsm',
     'dbg-client.jsm',
     'event-emitter.js',
     'Loader.jsm',
-    'Simulator.jsm',
 ]
 
 # Extra compatibility layer for transitional URLs used for part of 44 cycle
 EXTRA_JS_MODULES.devtools.shared += [
-    'Console.jsm',
     'Loader.jsm',
 ]
-
-EXTRA_JS_MODULES.devtools.shared.apps += [
-    'Simulator.jsm',
-]