From 1fc5f0ebdcb9e8549bc20354f88c35d88c310ab6 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Wed, 20 Feb 2019 16:11:57 +0000
Subject: [PATCH] Bug 1526981 - [2.4] Simplify JSM module logger initialization
 and ensure compatibility with ES6. r=geckoview-reviewers,agi

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

--HG--
extra : moz-landing-system : lando
---
 mobile/android/chrome/geckoview/ErrorPageEventHandler.js   | 3 +--
 mobile/android/chrome/geckoview/GeckoViewContentChild.js   | 4 ++--
 mobile/android/chrome/geckoview/GeckoViewMediaChild.js     | 2 +-
 .../android/chrome/geckoview/GeckoViewNavigationChild.js   | 4 ++--
 mobile/android/chrome/geckoview/GeckoViewProgressChild.js  | 4 ++--
 mobile/android/chrome/geckoview/GeckoViewScrollChild.js    | 4 ++--
 .../chrome/geckoview/GeckoViewSelectionActionChild.js      | 5 ++---
 mobile/android/chrome/geckoview/GeckoViewSettingsChild.js  | 4 ++--
 .../components/geckoview/GeckoViewExternalAppService.js    | 3 +--
 mobile/android/components/geckoview/GeckoViewStartup.js    | 3 +--
 mobile/android/modules/geckoview/ContentCrashHandler.jsm   | 2 +-
 .../android/modules/geckoview/GeckoViewAccessibility.jsm   | 2 ++
 mobile/android/modules/geckoview/GeckoViewAutoFill.jsm     | 2 +-
 mobile/android/modules/geckoview/GeckoViewChildModule.jsm  | 4 ++--
 mobile/android/modules/geckoview/GeckoViewConsole.jsm      | 2 +-
 mobile/android/modules/geckoview/GeckoViewContent.jsm      | 2 ++
 .../android/modules/geckoview/GeckoViewContentBlocking.jsm | 2 ++
 mobile/android/modules/geckoview/GeckoViewMedia.jsm        | 2 ++
 mobile/android/modules/geckoview/GeckoViewModule.jsm       | 7 ++++++-
 mobile/android/modules/geckoview/GeckoViewNavigation.jsm   | 2 ++
 mobile/android/modules/geckoview/GeckoViewProgress.jsm     | 2 ++
 .../android/modules/geckoview/GeckoViewRemoteDebugger.jsm  | 2 +-
 mobile/android/modules/geckoview/GeckoViewSettings.jsm     | 2 ++
 mobile/android/modules/geckoview/GeckoViewTab.jsm          | 2 ++
 mobile/android/modules/geckoview/GeckoViewUtils.jsm        | 1 +
 mobile/android/modules/geckoview/LoadURIDelegate.jsm       | 2 +-
 .../telemetry/geckoview/GeckoViewTelemetryController.jsm   | 2 +-
 27 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/mobile/android/chrome/geckoview/ErrorPageEventHandler.js b/mobile/android/chrome/geckoview/ErrorPageEventHandler.js
index 386e00645ac8..ee550e59a597 100644
--- a/mobile/android/chrome/geckoview/ErrorPageEventHandler.js
+++ b/mobile/android/chrome/geckoview/ErrorPageEventHandler.js
@@ -7,8 +7,7 @@ const {GeckoViewUtils} = ChromeUtils.import("resource://gre/modules/GeckoViewUti
 var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-/* global debug:false, warn:false */
-GeckoViewUtils.initLogging("ErrorPageEventHandler", this);
+const {debug, warn} = GeckoViewUtils.initLogging("ErrorPageEventHandler"); // eslint-disable-line no-unused-vars
 
 ChromeUtils.defineModuleGetter(this, "SSLExceptions",
                                "resource://gre/modules/SSLExceptions.jsm");
diff --git a/mobile/android/chrome/geckoview/GeckoViewContentChild.js b/mobile/android/chrome/geckoview/GeckoViewContentChild.js
index 2f1454410218..cd6c241203e9 100644
--- a/mobile/android/chrome/geckoview/GeckoViewContentChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewContentChild.js
@@ -451,5 +451,5 @@ class GeckoViewContentChild extends GeckoViewChildModule {
   }
 }
 
-let {debug, warn} = GeckoViewContentChild.initLogging("GeckoViewContent");
-let module = GeckoViewContentChild.create(this);
+const {debug, warn} = GeckoViewContentChild.initLogging("GeckoViewContent"); // eslint-disable-line no-unused-vars
+const module = GeckoViewContentChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewMediaChild.js b/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
index e76a4c4ba70e..32281c0dbff6 100644
--- a/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
@@ -428,5 +428,5 @@ class GeckoViewMediaChild extends GeckoViewChildModule {
   }
 }
 
-const {debug, warn} = GeckoViewMediaChild.initLogging("GeckoViewMedia");
+const {debug, warn} = GeckoViewMediaChild.initLogging("GeckoViewMedia"); // eslint-disable-line no-unused-vars
 const module = GeckoViewMediaChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewNavigationChild.js b/mobile/android/chrome/geckoview/GeckoViewNavigationChild.js
index e26b97131d01..f212533324f1 100644
--- a/mobile/android/chrome/geckoview/GeckoViewNavigationChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewNavigationChild.js
@@ -137,5 +137,5 @@ class GeckoViewNavigationChild extends GeckoViewChildModule {
   }
 }
 
-let {debug, warn} = GeckoViewNavigationChild.initLogging("GeckoViewNavigation");
-let module = GeckoViewNavigationChild.create(this);
+const {debug, warn} = GeckoViewNavigationChild.initLogging("GeckoViewNavigation"); // eslint-disable-line no-unused-vars
+const module = GeckoViewNavigationChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewProgressChild.js b/mobile/android/chrome/geckoview/GeckoViewProgressChild.js
index 6394552811e9..6fec3b9c661f 100644
--- a/mobile/android/chrome/geckoview/GeckoViewProgressChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewProgressChild.js
@@ -333,5 +333,5 @@ const ProgressTracker = {
 };
 
 
-let {debug, warn} = GeckoViewProgressChild.initLogging("GeckoViewProgress");
-let module = GeckoViewProgressChild.create(this);
+const {debug, warn} = GeckoViewProgressChild.initLogging("GeckoViewProgress"); // eslint-disable-line no-unused-vars
+const module = GeckoViewProgressChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewScrollChild.js b/mobile/android/chrome/geckoview/GeckoViewScrollChild.js
index 65072e276a4b..4825f4ef078c 100644
--- a/mobile/android/chrome/geckoview/GeckoViewScrollChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewScrollChild.js
@@ -37,5 +37,5 @@ class GeckoViewScrollChild extends GeckoViewChildModule {
   }
 }
 
-let {debug, warn} = GeckoViewScrollChild.initLogging("GeckoViewScroll");
-let module = GeckoViewScrollChild.create(this);
+const {debug, warn} = GeckoViewScrollChild.initLogging("GeckoViewScroll"); // eslint-disable-line no-unused-vars
+const module = GeckoViewScrollChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewSelectionActionChild.js b/mobile/android/chrome/geckoview/GeckoViewSelectionActionChild.js
index 16274a0566d8..4a23ae3b2663 100644
--- a/mobile/android/chrome/geckoview/GeckoViewSelectionActionChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewSelectionActionChild.js
@@ -238,6 +238,5 @@ class GeckoViewSelectionActionChild extends GeckoViewChildModule {
   }
 }
 
-let {debug, warn} =
-    GeckoViewSelectionActionChild.initLogging("GeckoViewSelectionAction");
-let module = GeckoViewSelectionActionChild.create(this);
+const {debug, warn} = GeckoViewSelectionActionChild.initLogging("GeckoViewSelectionAction"); // eslint-disable-line no-unused-vars
+const module = GeckoViewSelectionActionChild.create(this);
diff --git a/mobile/android/chrome/geckoview/GeckoViewSettingsChild.js b/mobile/android/chrome/geckoview/GeckoViewSettingsChild.js
index 2181df58e6a9..60ef95c27420 100644
--- a/mobile/android/chrome/geckoview/GeckoViewSettingsChild.js
+++ b/mobile/android/chrome/geckoview/GeckoViewSettingsChild.js
@@ -152,5 +152,5 @@ class GeckoViewSettingsChild extends GeckoViewChildModule {
   }
 }
 
-let {debug, warn} = GeckoViewSettingsChild.initLogging("GeckoViewSettings");
-let module = GeckoViewSettingsChild.create(this);
+const {debug, warn} = GeckoViewSettingsChild.initLogging("GeckoViewSettings"); // eslint-disable-line no-unused-vars
+const module = GeckoViewSettingsChild.create(this);
diff --git a/mobile/android/components/geckoview/GeckoViewExternalAppService.js b/mobile/android/components/geckoview/GeckoViewExternalAppService.js
index 09418a1af2be..08caa4dabb33 100644
--- a/mobile/android/components/geckoview/GeckoViewExternalAppService.js
+++ b/mobile/android/components/geckoview/GeckoViewExternalAppService.js
@@ -7,8 +7,7 @@
 const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 const {GeckoViewUtils} = ChromeUtils.import("resource://gre/modules/GeckoViewUtils.jsm");
 
-/* global debug:false, warn:false */
-GeckoViewUtils.initLogging("ExternalAppService", this);
+const {debug, warn} = GeckoViewUtils.initLogging("ExternalAppService"); // eslint-disable-line no-unused-vars
 
 ChromeUtils.defineModuleGetter(this, "EventDispatcher",
   "resource://gre/modules/Messaging.jsm");
diff --git a/mobile/android/components/geckoview/GeckoViewStartup.js b/mobile/android/components/geckoview/GeckoViewStartup.js
index 153bb1d6523b..702282609b01 100644
--- a/mobile/android/components/geckoview/GeckoViewStartup.js
+++ b/mobile/android/components/geckoview/GeckoViewStartup.js
@@ -15,8 +15,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Services: "resource://gre/modules/Services.jsm",
 });
 
-/* global debug:false, warn:false */
-GeckoViewUtils.initLogging("Startup", this);
+const {debug, warn} = GeckoViewUtils.initLogging("Startup"); // eslint-disable-line no-unused-vars
 
 function GeckoViewStartup() {
 }
diff --git a/mobile/android/modules/geckoview/ContentCrashHandler.jsm b/mobile/android/modules/geckoview/ContentCrashHandler.jsm
index d8e10605adf1..75c285c4b285 100644
--- a/mobile/android/modules/geckoview/ContentCrashHandler.jsm
+++ b/mobile/android/modules/geckoview/ContentCrashHandler.jsm
@@ -18,7 +18,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
 ChromeUtils.defineModuleGetter(this, "OS",
                                "resource://gre/modules/osfile.jsm");
 
-GeckoViewUtils.initLogging("ContentCrashHandler", this);
+const {debug, warn} = GeckoViewUtils.initLogging("ContentCrashHandler"); // eslint-disable-line no-unused-vars
 
 function getDir(name) {
   let uAppDataPath = Services.dirsvc.get("UAppData", Ci.nsIFile).path;
diff --git a/mobile/android/modules/geckoview/GeckoViewAccessibility.jsm b/mobile/android/modules/geckoview/GeckoViewAccessibility.jsm
index cad9447ac0ef..c4f27d61c863 100644
--- a/mobile/android/modules/geckoview/GeckoViewAccessibility.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewAccessibility.jsm
@@ -25,3 +25,5 @@ class GeckoViewAccessibility extends GeckoViewModule {
     }, "GeckoView:AccessibilitySettings");
   }
 }
+
+const {debug, warn} = GeckoViewAccessibility.initLogging("GeckoViewAccessibility"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewAutoFill.jsm b/mobile/android/modules/geckoview/GeckoViewAutoFill.jsm
index 1c2b43a31b2a..49f1a3c89c58 100644
--- a/mobile/android/modules/geckoview/GeckoViewAutoFill.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewAutoFill.jsm
@@ -15,7 +15,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   LoginManagerContent: "resource://gre/modules/LoginManagerContent.jsm",
 });
 
-GeckoViewUtils.initLogging("AutoFill", this);
+const {debug, warn} = GeckoViewUtils.initLogging("AutoFill"); // eslint-disable-line no-unused-vars
 
 class GeckoViewAutoFill {
   constructor(aEventDispatcher) {
diff --git a/mobile/android/modules/geckoview/GeckoViewChildModule.jsm b/mobile/android/modules/geckoview/GeckoViewChildModule.jsm
index 6c2a523dfb1f..35a1415344b8 100644
--- a/mobile/android/modules/geckoview/GeckoViewChildModule.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewChildModule.jsm
@@ -8,13 +8,13 @@ var EXPORTED_SYMBOLS = ["GeckoViewChildModule"];
 
 const {GeckoViewUtils} = ChromeUtils.import("resource://gre/modules/GeckoViewUtils.jsm");
 
-GeckoViewUtils.initLogging("Module[C]", this);
+const {debug, warn} = GeckoViewUtils.initLogging("Module[C]"); // eslint-disable-line no-unused-vars
 
 class GeckoViewChildModule {
   static initLogging(aModuleName) {
     this._moduleName = aModuleName;
     const tag = aModuleName.replace("GeckoView", "") + "[C]";
-    return GeckoViewUtils.initLogging(tag, {});
+    return GeckoViewUtils.initLogging(tag);
   }
 
   static create(aGlobal, aModuleName) {
diff --git a/mobile/android/modules/geckoview/GeckoViewConsole.jsm b/mobile/android/modules/geckoview/GeckoViewConsole.jsm
index 4b4827223b45..0797e30f64f5 100644
--- a/mobile/android/modules/geckoview/GeckoViewConsole.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewConsole.jsm
@@ -12,7 +12,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Services: "resource://gre/modules/Services.jsm",
 });
 
-GeckoViewUtils.initLogging("Console", this);
+const {debug, warn} = GeckoViewUtils.initLogging("Console"); // eslint-disable-line no-unused-vars
 
 const LOG_EVENT_TOPIC = "console-api-log-event";
 
diff --git a/mobile/android/modules/geckoview/GeckoViewContent.jsm b/mobile/android/modules/geckoview/GeckoViewContent.jsm
index c422869d86e1..0dc9f67a4253 100644
--- a/mobile/android/modules/geckoview/GeckoViewContent.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewContent.jsm
@@ -350,3 +350,5 @@ class GeckoViewContent extends GeckoViewModule {
     finder.highlight(true, finder.searchString, linksOnly, !!aData.drawOutline);
   }
 }
+
+const {debug, warn} = GeckoViewContent.initLogging("GeckoViewContent"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm b/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm
index 198cbeb36487..20513d7bea1f 100644
--- a/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm
@@ -54,3 +54,5 @@ class GeckoViewContentBlocking extends GeckoViewModule {
     this.eventDispatcher.sendRequest(message);
   }
 }
+
+const {debug, warn} = GeckoViewContentBlocking.initLogging("GeckoViewContentBlocking"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewMedia.jsm b/mobile/android/modules/geckoview/GeckoViewMedia.jsm
index 21f63a977516..b7f6b4327584 100644
--- a/mobile/android/modules/geckoview/GeckoViewMedia.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewMedia.jsm
@@ -31,3 +31,5 @@ class GeckoViewMedia extends GeckoViewModule {
     this.messageManager.sendAsyncMessage(aEvent, aData);
   }
 }
+
+const {debug, warn} = GeckoViewMedia.initLogging("GeckoViewMedia"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewModule.jsm b/mobile/android/modules/geckoview/GeckoViewModule.jsm
index a11b6000393d..791476d7cb93 100644
--- a/mobile/android/modules/geckoview/GeckoViewModule.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewModule.jsm
@@ -8,9 +8,14 @@ var EXPORTED_SYMBOLS = ["GeckoViewModule"];
 
 const {GeckoViewUtils} = ChromeUtils.import("resource://gre/modules/GeckoViewUtils.jsm");
 
-GeckoViewUtils.initLogging("Module", this);
+const {debug, warn} = GeckoViewUtils.initLogging("Module"); // eslint-disable-line no-unused-vars
 
 class GeckoViewModule {
+  static initLogging(aModuleName) {
+    const tag = aModuleName.replace("GeckoView", "");
+    return GeckoViewUtils.initLogging(tag);
+  }
+
   constructor(aModuleInfo) {
     this._info = aModuleInfo;
 
diff --git a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm b/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
index 6a858d00290b..4518d266ebaa 100644
--- a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewNavigation.jsm
@@ -340,3 +340,5 @@ class GeckoViewNavigation extends GeckoViewModule {
     this.eventDispatcher.sendRequest(message);
   }
 }
+
+const {debug, warn} = GeckoViewNavigation.initLogging("GeckoViewNavigation"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
index cfa6f69bec90..795d9b9d24a2 100644
--- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
@@ -259,3 +259,5 @@ class GeckoViewProgress extends GeckoViewModule {
     }
   }
 }
+
+const {debug, warn} = GeckoViewProgress.initLogging("GeckoViewProgress"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm b/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
index 1b79589e00d2..d39f21cd0102 100644
--- a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
@@ -28,7 +28,7 @@ XPCOMUtils.defineLazyGetter(this, "SocketListener", () => {
   return SocketListener;
 });
 
-GeckoViewUtils.initLogging("RemoteDebugger", this);
+const {debug, warn} = GeckoViewUtils.initLogging("RemoteDebugger"); // eslint-disable-line no-unused-vars
 
 var GeckoViewRemoteDebugger = {
   observe(aSubject, aTopic, aData) {
diff --git a/mobile/android/modules/geckoview/GeckoViewSettings.jsm b/mobile/android/modules/geckoview/GeckoViewSettings.jsm
index 3d3b8e56234f..26b4c6a14e27 100644
--- a/mobile/android/modules/geckoview/GeckoViewSettings.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewSettings.jsm
@@ -119,3 +119,5 @@ class GeckoViewSettings extends GeckoViewModule {
     this.window.docShell.displayMode = aMode;
   }
 }
+
+const {debug, warn} = GeckoViewSettings.initLogging("GeckoViewSettings"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.jsm
index 51b4b102eb6d..fee22fbb3134 100644
--- a/mobile/android/modules/geckoview/GeckoViewTab.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewTab.jsm
@@ -60,3 +60,5 @@ class GeckoViewTab extends GeckoViewModule {
     };
   }
 }
+
+const {debug, warn} = GeckoViewTab.initLogging("GeckoViewTab"); // eslint-disable-line no-unused-vars
diff --git a/mobile/android/modules/geckoview/GeckoViewUtils.jsm b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
index 58cfc2c344d8..a148045847c3 100644
--- a/mobile/android/modules/geckoview/GeckoViewUtils.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
@@ -375,6 +375,7 @@ var GeckoViewUtils = {
    * @param aScope Scope to add the logging functions to.
    */
   initLogging: function(aTag, aScope) {
+    aScope = aScope || {};
     const tag = "GeckoView." + aTag.replace(/^GeckoView\.?/, "");
 
     // Only provide two levels for simplicity.
diff --git a/mobile/android/modules/geckoview/LoadURIDelegate.jsm b/mobile/android/modules/geckoview/LoadURIDelegate.jsm
index bb940235031d..5366fb2d0902 100644
--- a/mobile/android/modules/geckoview/LoadURIDelegate.jsm
+++ b/mobile/android/modules/geckoview/LoadURIDelegate.jsm
@@ -13,7 +13,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Services: "resource://gre/modules/Services.jsm",
 });
 
-GeckoViewUtils.initLogging("LoadURIDelegate", this);
+const {debug, warn} = GeckoViewUtils.initLogging("LoadURIDelegate"); // eslint-disable-line no-unused-vars
 
 const LoadURIDelegate = {
   // Delegate URI loading to the app.
diff --git a/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm b/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm
index 23c5e04f1fa0..055fcc84992e 100644
--- a/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm
+++ b/toolkit/components/telemetry/geckoview/GeckoViewTelemetryController.jsm
@@ -13,7 +13,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
 });
 
-GeckoViewUtils.initLogging("GeckoView.TelemetryController", this);
+const {debug, warn} = GeckoViewUtils.initLogging("GeckoView.TelemetryController"); // eslint-disable-line no-unused-vars
 
 var EXPORTED_SYMBOLS = ["GeckoViewTelemetryController"];