fixup! Bug 30237: Add v3 onion services client authentication prompt

Bug 42246: Migrate tor connection stuff from browser to toolkit

browser/components/onionservices/content/authPreferences.css

 /* Copyright (c) 2020, The Tor Project, Inc. */
 
-@import url("chrome://browser/skin/browser-colors.css");
+@import url("chrome://global/skin/browser-colors.css");
 
 #torOnionServiceKeys-overview-container {
   margin-inline-end: 30px;

browser/components/onionservices/content/authPreferences.js

@@ -2,11 +2,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "TorStrings",
-  "resource:///modules/TorStrings.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  TorStrings: "resource://gre/modules/TorStrings.sys.mjs",
+});
 
 /* globals gSubDialog */
 

browser/components/onionservices/content/authPrompt.js

@@ -8,11 +8,9 @@ const OnionAuthPrompt = (function () {
   const lazy = {};
   ChromeUtils.defineESModuleGetters(lazy, {
     TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
+    TorStrings: "resource://gre/modules/TorStrings.sys.mjs",
     CommonUtils: "resource://services-common/utils.sys.mjs",
   });
-  XPCOMUtils.defineLazyModuleGetters(lazy, {
-    TorStrings: "resource:///modules/TorStrings.jsm",
-  });
 
   // OnionServicesAuthPrompt objects run within the main/chrome process.
   // aReason is the topic passed within the observer notification that is

browser/components/onionservices/content/savedKeysDialog.js

@@ -2,11 +2,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "TorStrings",
-  "resource:///modules/TorStrings.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  TorStrings: "resource://gre/modules/TorStrings.sys.mjs",
+});
 
 ChromeUtils.defineESModuleGetters(this, {
   TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",

toolkit/actors/NetErrorChild.sys.mjs

@@ -7,14 +7,9 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AppInfo: "chrome://remote/content/shared/AppInfo.sys.mjs",
+  TorStrings: "resource://gre/modules/TorStrings.sys.mjs",
 });
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "TorStrings",
-  "resource:///modules/TorStrings.jsm"
-);
-
 import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
 
 export class NetErrorChild extends RemotePageChild {