Bug 1772107 - Use plain object for lazy getter in uriloader/exthandler/. r=smaug

Depends on D147893

Differential Revision: https://phabricator.services.mozilla.com/D147894

uriloader/exthandler/WebHandlerApp.jsm

@@ -4,8 +4,10 @@
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
+const lazy = {};
+
 ChromeUtils.defineModuleGetter(
-  this,
+  lazy,
   "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
@@ -112,7 +114,7 @@ nsWebHandlerApp.prototype = {
     let win = Services.wm.getMostRecentWindow("navigator:browser");
 
     // If this is an extension handler, check private browsing access.
-    if (!privateAllowed && PrivateBrowsingUtils.isWindowPrivate(win)) {
+    if (!privateAllowed && lazy.PrivateBrowsingUtils.isWindowPrivate(win)) {
       throw Components.Exception(
         "Extension not allowed in private windows.",
         Cr.NS_ERROR_FILE_NOT_FOUND

uriloader/exthandler/tests/HandlerServiceTestUtils.jsm

@@ -17,20 +17,22 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
 
+const lazy = {};
+
 XPCOMUtils.defineLazyServiceGetter(
-  this,
+  lazy,
   "gExternalProtocolService",
   "@mozilla.org/uriloader/external-protocol-service;1",
   "nsIExternalProtocolService"
 );
 XPCOMUtils.defineLazyServiceGetter(
-  this,
+  lazy,
   "gMIMEService",
   "@mozilla.org/mime;1",
   "nsIMIMEService"
 );
 XPCOMUtils.defineLazyServiceGetter(
-  this,
+  lazy,
   "gHandlerService",
   "@mozilla.org/uriloader/handler-service;1",
   "nsIHandlerService"
@@ -47,7 +49,10 @@ var HandlerServiceTestUtils = {
    *         alphabetically regardless of category.
    */
   getAllHandlerInfoTypes() {
-    return Array.from(gHandlerService.enumerate(), info => info.type).sort();
+    return Array.from(
+      lazy.gHandlerService.enumerate(),
+      info => info.type
+    ).sort();
   },
 
   /**
@@ -86,7 +91,7 @@ var HandlerServiceTestUtils = {
       // access to getMIMEInfoFromOS. This means that we have to reset the data
       // that may have been imported from the default nsIHandlerService instance
       // and is not overwritten by fillHandlerInfo later.
-      let handlerInfo = gMIMEService.getFromTypeAndExtension(type, null);
+      let handlerInfo = lazy.gMIMEService.getFromTypeAndExtension(type, null);
       if (AppConstants.platform == "android") {
         // On Android, the first handler application is always the internal one.
         while (handlerInfo.possibleApplicationHandlers.length > 1) {
@@ -97,8 +102,8 @@ var HandlerServiceTestUtils = {
       }
       handlerInfo.setFileExtensions("");
       // Populate the object from the handler service instance under testing.
-      if (gHandlerService.exists(handlerInfo)) {
-        gHandlerService.fillHandlerInfo(handlerInfo, "");
+      if (lazy.gHandlerService.exists(handlerInfo)) {
+        lazy.gHandlerService.fillHandlerInfo(handlerInfo, "");
       }
       return handlerInfo;
     }
@@ -107,14 +112,14 @@ var HandlerServiceTestUtils = {
     // testing, like the nsIExternalProtocolService::GetProtocolHandlerInfo
     // method does on the default nsIHandlerService instance.
     let osDefaultHandlerFound = {};
-    let handlerInfo = gExternalProtocolService.getProtocolHandlerInfoFromOS(
+    let handlerInfo = lazy.gExternalProtocolService.getProtocolHandlerInfoFromOS(
       type,
       osDefaultHandlerFound
     );
-    if (gHandlerService.exists(handlerInfo)) {
-      gHandlerService.fillHandlerInfo(handlerInfo, "");
+    if (lazy.gHandlerService.exists(handlerInfo)) {
+      lazy.gHandlerService.fillHandlerInfo(handlerInfo, "");
     } else {
-      gExternalProtocolService.setProtocolHandlerDefaults(
+      lazy.gExternalProtocolService.setProtocolHandlerDefaults(
         handlerInfo,
         osDefaultHandlerFound.value
       );