Commit 5fd52216 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1795322 - Update toolkit modules references in services code. r=bdk

parent cce2d7f1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ add_task(async function test_sqlite_shutdown() {
    path: "kinto.sqlite",
  });

  // Shutdown Sqlite.jsm synchronously.
  // Shutdown Sqlite.sys.mjs synchronously.
  Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true);
  AsyncShutdown.profileBeforeChange._trigger();
  Services.prefs.clearUserPref("toolkit.asyncshutdown.testing");
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
// from Firefox browser code, hence the presence of these privileged browser APIs.
// If you're trying to use this from ordinary web content you're in for a bad time.

const {setTimeout} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const {setTimeout} = ChromeUtils.importESModule("resource://gre/modules/Timer.sys.mjs");
// We cannot use WebSocket from chrome code without a window,
// see https://bugzilla.mozilla.org/show_bug.cgi?id=784686
const browser = Services.appShell.createWindowlessBrowser(true);
+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ function getErrorDetails(error) {
    .replace(/\/.*\//gm, "[REDACTED]");
  let details = { message: cleanMessage, stack: null };

  // Adapted from Console.jsm.
  // Adapted from Console.sys.mjs.
  if (error.stack) {
    let frames = [];
    for (let frame = error.stack; frame; frame = frame.caller) {
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@

#include "nsISupports.idl"

// Adapts a `Log.jsm` logger so that it can be used from native (Rust) code.
// Adapts a `Log.sys.mjs` logger so that it can be used from native (Rust) code.
// The synced bookmarks mirror and bridged engines implement this interface
// to hook in to the services `LogManager` infrastructure.
[scriptable, uuid(c92bfe0d-50b7-4a7f-9686-fe5335a696b9)]
+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ XPCOMUtils.defineLazyServiceGetter(
);

// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
// See LOG_LEVELS in Console.jsm. Common examples: "all", "debug", "info", "warn", "error".
// See LOG_LEVELS in Console.sys.mjs. Common examples: "all", "debug", "info",
// "warn", "error".
const log = (() => {
  const { ConsoleAPI } = ChromeUtils.importESModule(
    "resource://gre/modules/Console.sys.mjs"
Loading