Backed out 3 changesets (bug 1834222, bug 1834176) for causing RemoteProcessMonitor failures. CLOSED TREE
Backed out changeset 346d3a1568dd (bug 1834222) Backed out changeset ea1d8b634bfc (bug 1834176) Backed out changeset 74d1880272d3 (bug 1834176)
This commit is contained in:
@@ -10,6 +10,7 @@ const AUTH_TYPE = {
|
||||
SCHEME_DIGEST: 2,
|
||||
};
|
||||
|
||||
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
|
||||
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
|
||||
import { MigrationUtils } from "resource:///modules/MigrationUtils.sys.mjs";
|
||||
import { MigratorBase } from "resource:///modules/MigratorBase.sys.mjs";
|
||||
@@ -19,11 +20,14 @@ const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
ChromeMigrationUtils: "resource:///modules/ChromeMigrationUtils.sys.mjs",
|
||||
FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
|
||||
NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
|
||||
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
|
||||
Qihoo360seMigrationUtils: "resource:///modules/360seMigrationUtils.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
NetUtil: "resource://gre/modules/NetUtil.jsm",
|
||||
});
|
||||
|
||||
/**
|
||||
* Converts an array of chrome bookmark objects into one our own places code
|
||||
* understands.
|
||||
|
||||
@@ -6,9 +6,7 @@ var { MigrationUtils } = ChromeUtils.importESModule(
|
||||
var { LoginHelper } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/LoginHelper.sys.mjs"
|
||||
);
|
||||
var { NetUtil } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/NetUtil.sys.mjs"
|
||||
);
|
||||
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
|
||||
var { PlacesUtils } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/PlacesUtils.sys.mjs"
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user