Backed out changeset b05c8f63d8a2 (bug 1319844)

browser/modules/LaterRun.jsm

@@ -10,6 +10,10 @@ this.EXPORTED_SYMBOLS = ["LaterRun"];
 
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "setInterval", "resource://gre/modules/Timer.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "clearInterval", "resource://gre/modules/Timer.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow", "resource://gre/modules/RecentWindow.jsm");
 
 const kEnabledPref = "browser.laterrun.enabled";
 const kPagePrefRoot = "browser.laterrun.pages.";

dom/console/ConsoleAPIStorage.js

@@ -31,8 +31,7 @@ const CONSOLEAPISTORAGE_CID = Components.ID('{96cf7855-dfa9-4c6d-8276-f9705b4890
  * ID.
  *
  * Usage:
- *    let ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
- *                              .getService(Ci.nsIConsoleAPIStorage);
+ *    Cu.import("resource://gre/modules/ConsoleAPIStorage.jsm");
  *
  *    // Get the cached events array for the window you want (use the inner
  *    // window ID).

toolkit/content/widgets/videocontrols.xml

@@ -2071,7 +2071,7 @@
 
   </binding>
 
-  <binding id="touchControlsGonk" extends="chrome://global/content/bindings/videocontrols.xml#touchControls">
+  <binding id="touchControlsGonk" extends="chrome://global/content/bindings/videoControls.xml#touchControls">
     <implementation>
       <constructor>
           this.isGonk = true;