Bug 776518 - Move Require.jsm somewhere into toolkit to fix comm-central's busted XPCShell tests; r=gavin

This commit is contained in:
Rob Campbell 2012-07-24 15:02:10 -07:00
parent a2cccfbb98
commit d03e611eb5
8 changed files with 8 additions and 8 deletions

View File

@ -26,7 +26,7 @@
var EXPORTED_SYMBOLS = [ "gcli" ];
Components.utils.import("resource://gre/modules/devtools/Require.jsm");
Components.utils.import("resource://gre/modules/Require.jsm");
Components.utils.import("resource:///modules/devtools/Console.jsm");
Components.utils.import("resource:///modules/devtools/Browser.jsm");

View File

@ -11,7 +11,7 @@ function test() {
let [ define, require ] = (function() {
let tempScope = {};
Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
Components.utils.import("resource://gre/modules/Require.jsm", tempScope);
return [ tempScope.define, tempScope.require ];
})();

View File

@ -42,7 +42,7 @@ let tabSizeOrig = undefined;
let remoteHostOrig = undefined;
function setup() {
Components.utils.import("resource://gre/modules/devtools/Require.jsm", imports);
Components.utils.import("resource://gre/modules/Require.jsm", imports);
imports.settings = imports.require("gcli/settings");
tiltEnabledOrig = imports.prefBranch.getBoolPref("devtools.tilt.enabled");

View File

@ -41,7 +41,7 @@ let tabSizeOrig = undefined;
let remoteHostOrig = undefined;
function setup() {
Components.utils.import("resource://gre/modules/devtools/Require.jsm", imports);
Components.utils.import("resource://gre/modules/Require.jsm", imports);
imports.settings = imports.require("gcli/settings");
tiltEnabled = imports.settings.getSetting("devtools.tilt.enabled");

View File

@ -54,7 +54,7 @@
let [ define, require ] = (function() {
let tempScope = {};
Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
Components.utils.import("resource://gre/modules/Require.jsm", tempScope);
return [ tempScope.define, tempScope.require ];
})();

View File

@ -6,7 +6,7 @@
let [ define, require ] = (function() {
let tempScope = {};
Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
Components.utils.import("resource://gre/modules/Require.jsm", tempScope);
return [ tempScope.define, tempScope.require ];
})();

View File

@ -17,7 +17,7 @@
var EXPORTED_SYMBOLS = [ "SourceMapConsumer", "SourceMapGenerator", "SourceNode" ];
Components.utils.import('resource://gre/modules/devtools/Require.jsm');
Components.utils.import('resource://gre/modules/Require.jsm');
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors

View File

@ -12,7 +12,7 @@
* https://github.com/mozilla/source-map/
*/
Components.utils.import('resource://gre/modules/devtools/Require.jsm');
Components.utils.import('resource://gre/modules/Require.jsm');
Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
let EXPORTED_SYMBOLS = [ "define", "runSourceMapTests" ];