Merge pull request #213 from Gozala/bugs/explicit-require.672087

Bug 672087 - Use explicit require statements in SDK modules. r=warner

packages/addon-kit/lib/clipboard.js

@@ -41,8 +41,8 @@
 "use strict";
 
 const {Cc,Ci} = require("chrome");
-const errors = require("errors");
-const apiUtils = require("api-utils");
+const errors = require("api-utils/errors");
+const apiUtils = require("api-utils/api-utils");
 
 /*
 While these data flavors resemble Internet media types, they do

packages/addon-kit/lib/context-menu.js

@@ -42,25 +42,25 @@
 
 const {Ci} = require("chrome");
 
-if (!require("xul-app").is("Firefox")) {
+if (!require("api-utils/xul-app").is("Firefox")) {
   throw new Error([
     "The context-menu module currently supports only Firefox.  In the future ",
     "we would like it to support other applications, however.  Please see ",
     "https://bugzilla.mozilla.org/show_bug.cgi?id=560716 for more information."
   ].join(""));
 }
 
-const apiUtils = require("api-utils");
-const collection = require("collection");
-const { Worker } = require("content");
-const url = require("url");
-const { MatchPattern } = require("match-pattern");
-const { EventEmitterTrait: EventEmitter } = require("events");
-const observerServ = require("observer-service");
+const apiUtils = require("api-utils/api-utils");
+const collection = require("api-utils/collection");
+const { Worker } = require("api-utils/content");
+const url = require("api-utils/url");
+const { MatchPattern } = require("api-utils/match-pattern");
+const { EventEmitterTrait: EventEmitter } = require("api-utils/events");
+const observerServ = require("api-utils/observer-service");
 const jpSelf = require("self");
-const winUtils = require("window-utils");
-const { Trait } = require("light-traits");
-const { Cortex } = require("cortex");
+const winUtils = require("api-utils/window-utils");
+const { Trait } = require("api-utils/light-traits");
+const { Cortex } = require("api-utils/cortex");
 
 // All user items we add have this class name.
 const ITEM_CLASS = "jetpack-context-menu-item";
@@ -802,8 +802,8 @@ let browserManager = {
   // Note that calling this method will cause onTrack to be called immediately
   // for each currently open browser window.
   init: function BM_init() {
-    require("unload").ensure(this);
-    let windowTracker = new (require("window-utils").WindowTracker)(this);
+    require("api-utils/unload").ensure(this);
+    let windowTracker = new (require("api-utils/window-utils").WindowTracker)(this);
 
     // On inner-window-destroyed, remove the destroyed inner window's outer
     // window from all items' worker registries.
@@ -1361,7 +1361,7 @@ ContextMenuPopup.prototype = {
   // Returns the OVERFLOW_THRESH_PREF pref value if it exists or
   // OVERFLOW_THRESH_DEFAULT if it doesn't.
   get _overflowThreshold() {
-    let prefs = require("preferences-service");
+    let prefs = require("api-utils/preferences-service");
     return prefs.get(OVERFLOW_THRESH_PREF, OVERFLOW_THRESH_DEFAULT);
   },
 

packages/addon-kit/lib/hotkeys.js

@@ -41,8 +41,9 @@
 
 const INVALID_HOTKEY = "Hotkey must have at least one modifier.";
 
-const { toJSON: jsonify, toString: stringify } = require("keyboard/utils");
-const { register, unregister } = require("keyboard/hotkeys");
+const { toJSON: jsonify,
+        toString: stringify } = require("api-utils/keyboard/utils");
+const { register, unregister } = require("api-utils/keyboard/hotkeys");
 
 const Hotkey = exports.Hotkey = function Hotkey(options) {
   if (!(this instanceof Hotkey))

packages/addon-kit/lib/notifications.js

@@ -40,8 +40,8 @@
 "use strict";
 
 const { Cc, Ci, Cr } = require("chrome");
-const apiUtils = require("api-utils");
-const errors = require("errors");
+const apiUtils = require("api-utils/api-utils");
+const errors = require("api-utils/errors");
 
 try {
   let alertServ = Cc["@mozilla.org/alerts-service;1"].

packages/addon-kit/lib/page-mod.js

@@ -38,13 +38,13 @@
  * ***** END LICENSE BLOCK ***** */
 "use strict";
 
-const observers = require("observer-service");
-const { Worker, Loader } = require('content');
-const { EventEmitter } = require('events');
-const { List } = require('list');
-const { Registry } = require('utils/registry');
-const xulApp = require("xul-app");
-const { MatchPattern } = require('match-pattern');
+const observers = require("api-utils/observer-service");
+const { Worker, Loader } = require('api-utils/content');
+const { EventEmitter } = require('api-utils/events');
+const { List } = require('api-utils/list');
+const { Registry } = require('api-utils/utils/registry');
+const xulApp = require("api-utils/xul-app");
+const { MatchPattern } = require('api-utils/match-pattern');
 
 // Whether or not the host application dispatches a document-element-inserted
 // notification when the document element is inserted into the DOM of a page.

packages/addon-kit/lib/page-worker.js

@@ -41,10 +41,10 @@
  * ***** END LICENSE BLOCK ***** */
 "use strict";
 
-const { Symbiont } = require("content");
-const { Trait } = require("traits");
+const { Symbiont } = require("api-utils/content");
+const { Trait } = require("api-utils/traits");
 
-if (!require("xul-app").isOneOf(["Firefox", "Thunderbird"])) {
+if (!require("api-utils/xul-app").isOneOf(["Firefox", "Thunderbird"])) {
   throw new Error([
     "The page-worker module currently supports only Firefox and Thunderbird. ",
     "In the future, we would like it to support other applications, however. ",

packages/addon-kit/lib/panel.js

@@ -38,7 +38,7 @@
 
 "use strict";
 
-if (!require("xul-app").is("Firefox")) {
+if (!require("api-utils/xul-app").is("Firefox")) {
   throw new Error([
     "The panel module currently supports only Firefox.  In the future ",
     "we would like it to support other applications, however.  Please see ",
@@ -48,12 +48,12 @@ if (!require("xul-app").is("Firefox")) {
 }
 
 const { Ci } = require("chrome");
-const { validateOptions: valid } = require("api-utils");
-const { Symbiont } = require("content");
-const { EventEmitter } = require('events');
-const timer = require("timer");
+const { validateOptions: valid } = require("api-utils/api-utils");
+const { Symbiont } = require("api-utils/content");
+const { EventEmitter } = require('api-utils/events');
+const timer = require("api-utils/timer");
 
-require("xpcom").utils.defineLazyServiceGetter(
+require("api-utils/xpcom").utils.defineLazyServiceGetter(
   this,
   "windowMediator",
   "@mozilla.org/appshell/window-mediator;1",

packages/addon-kit/lib/passwords.js

@@ -37,10 +37,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
-
-const { Trait } = require("light-traits");
-const utils = require("passwords/utils");
-const defer = require("utils/function").Enqueued;
+const { Trait } = require("api-utils/light-traits");
+const utils = require("api-utils/passwords/utils");
+const defer = require("api-utils/utils/function").Enqueued;
 
 /**
  * Utility function that returns `onComplete` and `onError` callbacks form the

packages/addon-kit/lib/private-browsing.js

@@ -39,18 +39,18 @@
 "use strict";
 
 const {Cc,Ci} = require("chrome");
-const observers = require("observer-service");
-const { EventEmitter } = require("events");
-const { setTimeout } = require("timer");
-const unload = require("unload");
+const observers = require("api-utils/observer-service");
+const { EventEmitter } = require("api-utils/events");
+const { setTimeout } = require("api-utils/timer");
+const unload = require("api-utils/unload");
 
 const ON_START = "start";
 const ON_STOP = "stop";
 const ON_TRANSITION = "private-browsing-transition-complete";
 
 let pbService;
 // Currently, only Firefox implements the private browsing service.
-if (require("xul-app").is("Firefox")) {
+if (require("api-utils/xul-app").is("Firefox")) {
   pbService = Cc["@mozilla.org/privatebrowsing;1"].
               getService(Ci.nsIPrivateBrowsingService);
 }

packages/addon-kit/lib/request.js

@@ -36,14 +36,13 @@
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
-
-const xpcom = require("xpcom");
-const xhr = require("xhr");
-const errors = require("errors");
-const apiUtils = require("api-utils");
+const xpcom = require("api-utils/xpcom");
+const xhr = require("api-utils/xhr");
+const errors = require("api-utils/errors");
+const apiUtils = require("api-utils/api-utils");
 
 // Ugly but will fix with: https://bugzilla.mozilla.org/show_bug.cgi?id=596248
-const EventEmitter = require('events').EventEmitter.compose({
+const EventEmitter = require('api-utils/events').EventEmitter.compose({
   constructor: function EventEmitter() this
 });
 

packages/addon-kit/lib/selection.js

@@ -37,7 +37,7 @@
 
 "use strict";
 
-if (!require("xul-app").is("Firefox")) {
+if (!require("api-utils/xul-app").is("Firefox")) {
   throw new Error([
     "The selection module currently supports only Firefox.  In the future ",
     "we would like it to support other applications, however.  Please see ",
@@ -46,8 +46,8 @@ if (!require("xul-app").is("Firefox")) {
 }
 
 let { Ci } = require("chrome"),
-    { setTimeout } = require("timer"),
-    { EventEmitter } = require('events');
+    { setTimeout } = require("api-utils/timer"),
+    { EventEmitter } = require("api-utils/events");
 
 // The selection type HTML
 const HTML = 0x01;
@@ -95,7 +95,7 @@ function Selection(rangeNumber) {
   });
 }
 
-require("xpcom").utils.defineLazyServiceGetter(this, "windowMediator",
+require("api-utils/xpcom").utils.defineLazyServiceGetter(this, "windowMediator",
   "@mozilla.org/appshell/window-mediator;1", "nsIWindowMediator");
 
 /**
@@ -227,7 +227,8 @@ function onUnload(event) {
 }
 
 let SelectionListenerManager = {
-  QueryInterface: require("xpcom").utils.generateQI([Ci.nsISelectionListener]),
+  QueryInterface: require("api-utils/xpcom").utils.
+                  generateQI([Ci.nsISelectionListener]),
 
   // The collection of listeners wanting to be notified of selection changes
   listeners: EventEmitter.compose({
@@ -283,7 +284,7 @@ let SelectionListenerManager = {
     let self = this;
     function wrap(count, func) {
       if (count-- > 0)
-        require("timer").setTimeout(wrap, 0);
+        require("api-utils/timer").setTimeout(wrap, 0);
       else
         self.addSelectionListener(window);
     }
@@ -337,7 +338,7 @@ SelectionListenerManager.listeners.on('error', console.error);
  * Install |SelectionListenerManager| as tab tracker in order to watch
  * tab opening/closing
  */
-require("tab-browser").Tracker(SelectionListenerManager);
+require("api-utils/tab-browser").Tracker(SelectionListenerManager);
 
 /**
  * Exports an iterator so that discontiguous selections can be iterated.

packages/addon-kit/lib/simple-storage.js

@@ -41,13 +41,13 @@
 "use strict";
 
 const {Cc,Ci} = require("chrome");
-const file = require("file");
-const prefs = require("preferences-service");
+const file = require("api-utils/file");
+const prefs = require("api-utils/preferences-service");
 const jpSelf = require("self");
-const timer = require("timer");
-const unload = require("unload");
-const { EventEmitter } = require("events");
-const { Trait } = require("traits");
+const timer = require("api-utils/timer");
+const unload = require("api-utils/unload");
+const { EventEmitter } = require("api-utils/events");
+const { Trait } = require("api-utils/traits");
 
 const WRITE_PERIOD_PREF = "extensions.addon-sdk.simple-storage.writePeriod";
 const WRITE_PERIOD_DEFAULT = 300000; // 5 minutes

packages/addon-kit/lib/tabs.js

@@ -37,16 +37,16 @@
  * ***** END LICENSE BLOCK ***** */
 "use strict";
 
-if (!require("xul-app").is("Firefox")) {
+if (!require("api-utils/xul-app").is("Firefox")) {
   throw new Error([
     "The tabs module currently supports only Firefox.  In the future ",
     "we would like it to support other applications, however.  Please see ",
     "https://bugzilla.mozilla.org/show_bug.cgi?id=560716 for more information."
   ].join(""));
 }
 
-const { browserWindows } = require("windows");
-const { tabs } = require("windows/tabs");
+const { browserWindows } = require("./windows");
+const { tabs } = require("api-utils/windows/tabs");
 
 Object.defineProperties(tabs, {
   open: { value: function open(options) {

packages/addon-kit/lib/timers.js

@@ -37,4 +37,4 @@
 "use strict";
 
 // This module just proxies to the low level equivalent "timer" in "api-utils".
-module.exports = require("timer");
+module.exports = require("api-utils/timer");

packages/addon-kit/lib/widget.js

@@ -64,24 +64,24 @@ const EVENTS = {
   "mouseout": "mouseout",
 };
 
-if (!require("xul-app").is("Firefox")) {
+if (!require("api-utils/xul-app").is("Firefox")) {
   throw new Error([
     "The widget module currently supports only Firefox.  In the future ",
     "it will support other applications. Please see ",
     "https://bugzilla.mozilla.org/show_bug.cgi?id=560716 for more information."
   ].join(""));
 }
 
-const { validateOptions } = require("api-utils");
-const panels = require("panel");
-const { EventEmitter, EventEmitterTrait } = require("events");
-const { Trait } = require("traits");
-const LightTrait = require('light-traits').Trait;
-const { Loader, Symbiont } = require("content");
-const timer = require("timer");
-const { Cortex } = require('cortex');
-const windowsAPI = require("windows");
-const unload = require("unload");
+const { validateOptions } = require("api-utils/api-utils");
+const panels = require("./panel");
+const { EventEmitter, EventEmitterTrait } = require("api-utils/events");
+const { Trait } = require("api-utils/traits");
+const LightTrait = require('api-utils/light-traits').Trait;
+const { Loader, Symbiont } = require("api-utils/content");
+const timer = require("api-utils/timer");
+const { Cortex } = require('api-utils/cortex');
+const windowsAPI = require("./windows");
+const unload = require("api-utils/unload");
 
 // Data types definition
 const valid = {
@@ -124,7 +124,7 @@ let widgetAttributes = {
 
 // Import data definitions from loader, but don't compose with it as Model
 // functions allow us to recreate easily all Loader code.
-let loaderAttributes = require("content/loader").validationAttributes;
+let loaderAttributes = require("api-utils/content/loader").validationAttributes;
 for (let i in loaderAttributes)
   widgetAttributes[i] = loaderAttributes[i];
 
@@ -515,7 +515,7 @@ let browserManager = {
   // that calling this method can cause onTrack to be called immediately if
   // there are open windows.
   init: function () {
-    let windowTracker = new (require("window-utils").WindowTracker)(this);
+    let windowTracker = new (require("api-utils/window-utils").WindowTracker)(this);
     unload.ensure(windowTracker);
   },
 
@@ -721,7 +721,7 @@ WidgetChrome.prototype.update = function WC_update(updatedItem, property, value)
 WidgetChrome.prototype._createNode = function WC__createNode() {
   // XUL element container for widget
   let node = this._doc.createElement("toolbaritem");
-  let guid = require("xpcom").makeUuid().toString();
+  let guid = require("api-utils/xpcom").makeUuid().toString();
 
   // Temporary work around require("self") failing on unit-test execution ...
   let jetpackID = "testID";