Bug 839793 - TelemetryTimestamps.jsm imported using the wrong path. r=glandium

This commit is contained in:
Jim Mathies 2013-02-09 12:28:38 -06:00
parent 8c08a3ad5e
commit 8759ba05ed
5 changed files with 5 additions and 5 deletions

View File

@ -1318,7 +1318,7 @@ var gBrowserInit = {
_delayedStartup: function(uriToLoad, mustLoadSidebar) {
let tmp = {};
Cu.import("resource:///modules/TelemetryTimestamps.jsm", tmp);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
let TelemetryTimestamps = tmp.TelemetryTimestamps;
TelemetryTimestamps.add("delayedStartupStarted");

View File

@ -76,7 +76,7 @@ Cu.import("resource://gre/modules/Services.jsm", this);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
// debug.js adds NS_ASSERT. cf. bug 669196
Cu.import("resource://gre/modules/debug.js", this);
Cu.import("resource:///modules/TelemetryTimestamps.jsm", this);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", this);
Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", this);
Cu.import("resource://gre/modules/osfile.jsm", this);
Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", this);

View File

@ -118,7 +118,7 @@ function getSimpleMeasurements() {
var appTimestamps = {};
try {
let o = {};
Cu.import("resource:///modules/TelemetryTimestamps.jsm", o);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", o);
appTimestamps = o.TelemetryTimestamps.get();
} catch (ex) {}
try {

View File

@ -36,7 +36,7 @@ function run_test() {
function actualTest() {
// Test the module logic
let tmp = {};
Cu.import("resource:///modules/TelemetryTimestamps.jsm", tmp);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
let TelemetryTimestamps = tmp.TelemetryTimestamps;
let now = Date.now();
TelemetryTimestamps.add("foo");

View File

@ -2448,7 +2448,7 @@ this.AddonManager = {
};
// load the timestamps module into AddonManagerInternal
Cu.import("resource:///modules/TelemetryTimestamps.jsm", AddonManagerInternal);
Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", AddonManagerInternal);
Object.freeze(AddonManagerInternal);
Object.freeze(AddonManagerPrivate);
Object.freeze(AddonManager);