fixup! Bug 40925: Implemented the Security Level component

Linted

browser/components/securitylevel/content/securityLevel.js

@@ -383,7 +383,7 @@ var SecurityLevelPreferences = {
   /**
    * A list of radio options and their containers.
    *
-   * @type {Array<Object>}
+   * @type {Array<object>}
    */
   _radioOptions: null,
 

toolkit/components/securitylevel/SecurityLevel.jsm

@@ -3,29 +3,24 @@
 var EXPORTED_SYMBOLS = ["SecurityLevel"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const BrowserTopics = Object.freeze({
-  ProfileAfterChange: "profile-after-change",
-});
-
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
+
+const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(this, {
+XPCOMUtils.defineLazyModuleGetters(lazy, {
   ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
 });
 
-// Logger adapted from CustomizableUI.jsm
-XPCOMUtils.defineLazyGetter(this, "logger", () => {
-  const { ConsoleAPI } = ChromeUtils.import(
-    "resource://gre/modules/Console.jsm"
-  );
-  let consoleOptions = {
+const logger = new ConsoleAPI({
   maxLogLevel: "info",
   prefix: "SecurityLevel",
-  };
-  return new ConsoleAPI(consoleOptions);
+});
+
+const BrowserTopics = Object.freeze({
+  ProfileAfterChange: "profile-after-change",
 });
 
 // The Security Settings prefs in question.
@@ -79,7 +74,7 @@ var bindPrefAndInit = (prefName, prefHandler) =>
   bindPref(prefName, prefHandler, true);
 
 async function waitForExtensionMessage(extensionId, checker = () => {}) {
-  const { torWaitForExtensionMessage } = ExtensionParent;
+  const { torWaitForExtensionMessage } = lazy.ExtensionParent;
   if (torWaitForExtensionMessage) {
     return torWaitForExtensionMessage(extensionId, checker);
   }
@@ -87,7 +82,7 @@ async function waitForExtensionMessage(extensionId, checker = () => {}) {
 }
 
 async function sendExtensionMessage(extensionId, message) {
-  const { torSendExtensionMessage } = ExtensionParent;
+  const { torSendExtensionMessage } = lazy.ExtensionParent;
   if (torSendExtensionMessage) {
     return torSendExtensionMessage(extensionId, message);
   }
@@ -415,7 +410,7 @@ function migratePreferences() {
     security_custom: "security_level.security_custom",
     noscript_persist: "security_level.noscript_persist",
     noscript_inited: "security_level.noscript_inited",
-  }
+  };
   for (const [oldName, newName] of Object.entries(prefs)) {
     migrate(
       oldName,