Commit 96480e22 authored by Gijs Kruitbosch's avatar Gijs Kruitbosch
Browse files

Bug 1795255 - bustage fix: fix up some more imports that shouldn't have been... 

Bug 1795255 - bustage fix: fix up some more imports that shouldn't have been removed because of confused environment conflicts. CLOSED TREE

Differential Revision: https://phabricator.services.mozilla.com/D168379
parent bac46245

browser/components/customizableui/test/unit/test_unified_extensions_migration.js

+7 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,13 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ 




"use strict";

"use strict";





// We're in an xpcshell test but have an eslint browser test env applied;

// We definitely do need to manually import CustomizableUI.

// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix

const { CustomizableUI } = ChromeUtils.import(

  "resource:///modules/CustomizableUI.jsm"

);



do_get_profile();

do_get_profile();





// Make Cu.isInAutomation true. This is necessary so that we can use

// Make Cu.isInAutomation true. This is necessary so that we can use

remote/cdp/test/browser/head.js

+6 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,12 @@ 




"use strict";

"use strict";





// window.RemoteAgent is a simple object set in browser.js, and importing

// RemoteAgent conflicts with that.

// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix

const { RemoteAgent } = ChromeUtils.importESModule(

  "chrome://remote/content/components/RemoteAgent.sys.mjs"

);

const { RemoteAgentError } = ChromeUtils.importESModule(

const { RemoteAgentError } = ChromeUtils.importESModule(

  "chrome://remote/content/cdp/Error.sys.mjs"

  "chrome://remote/content/cdp/Error.sys.mjs"

);

);

toolkit/components/thumbnails/test/test_thumbnails_interfaces.js

+5 −0
Original line number Original line Diff line number Diff line 
"use strict";

"use strict";





// This is an xpcshell test and gets a browser test env applied, so we

// need to still manually import NetUtil.

// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix

const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");



// need profile so that PageThumbsStorageService can resolve the path to the underlying file

// need profile so that PageThumbsStorageService can resolve the path to the underlying file

do_get_profile();

do_get_profile();