Bug 1508990 - Enable ESLint for dom/ipc/ (manual changes) r=Standard8,mrbkap

Depends on D13887

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

--HG--
extra : moz-landing-system : lando

dom/ipc/ManifestMessagesChild.jsm

@@ -16,7 +16,6 @@
 var EXPORTED_SYMBOLS = ["ManifestMessagesChild"];
 
 ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 ChromeUtils.defineModuleGetter(this, "ManifestObtainer",
                                "resource://gre/modules/ManifestObtainer.jsm");

dom/ipc/remote-test.js

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* eslint-env mozilla/frame-script */
+
 dump("Loading remote script!\n");
 dump(content + "\n");
 

dom/ipc/tests/browser_domainPolicy.js

@@ -14,13 +14,13 @@ function deactivateDomainPolicy() {
 async function test_domainPolicy() {
 
   ChromeUtils.defineModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm");
-  let deferred = Promise.defer();
-  let currentTask = deferred.promise;
+  let outerDeferred = Promise.defer();
+  let currentTask = outerDeferred.promise;
   SpecialPowers.pushPrefEnv(
     {set: [["dom.ipc.browser_frames.oop_by_default", false],
           ["browser.pagethumbnails.capturing_disabled", false],
           ["dom.mozBrowserFramesEnabled", false]]},
-    () => { return deferred.resolve(); });
+    () => { return outerDeferred.resolve(); });
   await currentTask;
 
   // Create tab
@@ -37,7 +37,7 @@ async function test_domainPolicy() {
         let deferred = PromiseUtils.defer();
         let listener = (event) => {
           removeEventListener("DOMDocElementInserted", listener, true);
-          let listener2 = (event) => {
+          let listener2 = (event2) => {
             content.removeEventListener("load", listener2);
             deferred.resolve();
           };
@@ -95,8 +95,10 @@ async function test_domainPolicy() {
     ipcArgs.domain = domain;
     return (aUtils) => {
       ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+      // eslint-disable-next-line no-shadow
       var ipcArgs;
       var utils = {};
+      // eslint-disable-next-line no-eval
       eval(aUtils);
 
       let path = "/browser/dom/ipc/tests/file_disableScript.html";
@@ -122,7 +124,7 @@ async function test_domainPolicy() {
 
   info("Activating domainPolicy first, creating child process after");
   activateDomainPolicy();
-  var bl = policy.blocklist;
+  bl = policy.blocklist;
   bl.add(Services.io.newURI("http://example.com"));
   currentTask = initProcess();
   await currentTask;
@@ -134,23 +136,25 @@ async function test_domainPolicy() {
     ipcArgs.list = list;
     return (aUtils) => {
       ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
+      // eslint-disable-next-line no-shadow
       var ipcArgs;
       var utils = {};
+      // eslint-disable-next-line no-eval
       eval(aUtils);
 
       var results = [];
-      var testListInternal = function(expectEnabled, list, idx) {
+      var testListInternal = function(internalExpectEnabled, internalList, idx) {
         idx = idx || 0;
         let deferred = PromiseUtils.defer();
         let path = "/browser/dom/ipc/tests/file_disableScript.html";
-        let target = list[idx] + path;
+        let target = internalList[idx] + path;
         var rootFrame = content.document.getElementById("root");
         utils.navigateFrame(rootFrame, target).then(function() {
-          results.push(utils.checkScriptEnabled(rootFrame.contentWindow, expectEnabled));
-          if (idx == list.length - 1)
+          results.push(utils.checkScriptEnabled(rootFrame.contentWindow, internalExpectEnabled));
+          if (idx == internalList.length - 1)
             deferred.resolve(results);
           else
-            testListInternal(expectEnabled, list, idx + 1).then(function(retArg) { deferred.resolve(retArg); });
+            testListInternal(internalExpectEnabled, internalList, idx + 1).then(function(retArg) { deferred.resolve(retArg); });
         });
         return deferred.promise;
       };
@@ -171,39 +175,39 @@ async function test_domainPolicy() {
 
   function activate(isBlock, exceptions, superExceptions) {
     activateDomainPolicy();
-						let set = isBlock ? policy.blocklist : policy.allowlist;
-						let superSet = isBlock ? policy.superBlocklist : policy.superAllowlist;
-						for (var e of exceptions)
-							set.add(makeURI(e));
-						for (var e of superExceptions)
-							superSet.add(makeURI(e));
-					}
+    let set = isBlock ? policy.blocklist : policy.allowlist;
+    let superSet = isBlock ? policy.superBlocklist : policy.superAllowlist;
+    for (let e of exceptions)
+      set.add(makeURI(e));
+    for (let e of superExceptions)
+      superSet.add(makeURI(e));
+  }
 
-					info("Testing Blocklist-style Domain Policy");
-					info("Activating domainPolicy first, creating child process after");
-					activate(true, testPolicy.exceptions, testPolicy.superExceptions);
-					currentTask = initProcess();
-					await currentTask;
-					let results = [];
-					currentTask = runTest(testList(true, testPolicy.notExempt));
-					results = results.concat(await currentTask);
-					currentTask = runTest(testList(false, testPolicy.exempt));
-					results = results.concat(await currentTask);
-					checkAndCleanup(results);
+  info("Testing Blocklist-style Domain Policy");
+  info("Activating domainPolicy first, creating child process after");
+  activate(true, testPolicy.exceptions, testPolicy.superExceptions);
+  currentTask = initProcess();
+  await currentTask;
+  let results = [];
+  currentTask = runTest(testList(true, testPolicy.notExempt));
+  results = results.concat(await currentTask);
+  currentTask = runTest(testList(false, testPolicy.exempt));
+  results = results.concat(await currentTask);
+  checkAndCleanup(results);
 
-					info("Creating child process first, activating domainPolicy after");
-					currentTask = initProcess();
-					await currentTask;
-					activate(true, testPolicy.exceptions, testPolicy.superExceptions);
-					results = [];
-					currentTask = runTest(testList(true, testPolicy.notExempt));
-					results = results.concat(await currentTask);
-					currentTask = runTest(testList(false, testPolicy.exempt));
-					results = results.concat(await currentTask);
-					checkAndCleanup(results);
+  info("Creating child process first, activating domainPolicy after");
+  currentTask = initProcess();
+  await currentTask;
+  activate(true, testPolicy.exceptions, testPolicy.superExceptions);
+  results = [];
+  currentTask = runTest(testList(true, testPolicy.notExempt));
+  results = results.concat(await currentTask);
+  currentTask = runTest(testList(false, testPolicy.exempt));
+  results = results.concat(await currentTask);
+  checkAndCleanup(results);
 
-					info("Testing Allowlist-style Domain Policy");
-  deferred = Promise.defer();
+  info("Testing Allowlist-style Domain Policy");
+  let deferred = Promise.defer();
   currentTask = deferred.promise;
   SpecialPowers.pushPrefEnv({set: [["javascript.enabled", false]]}, () => { return deferred.resolve(); });
   await currentTask;

dom/ipc/tests/test_Preallocated.html

@@ -12,6 +12,7 @@ Test that the preallocated process starts up.
 
 <script type="application/javascript">
 "use strict";
+/* eslint-env mozilla/frame-script */
 
 SimpleTest.waitForExplicitFinish();
 

dom/ipc/tests/test_blob_sliced_from_child_process.html

@@ -9,6 +9,7 @@
   <body onload="setup();">
     <script type="application/javascript">
 "use strict";
+/* eslint-env mozilla/frame-script */
 
 function childFrameScript() {
   "use strict";
@@ -17,14 +18,10 @@ function childFrameScript() {
 
   const messageName = "test:blob-slice-test";
   const blobData = ["So", " ", "many", " ", "blobs!"];
-  const blobText = blobData.join("");
   const blobType = "text/plain";
 
   let blob = new Blob(blobData, { type: blobType });
 
-  let sliceText = blobData[2][1] + blobData[2][2];
-  let sliceIndex = blobText.indexOf(sliceText);
-
   let firstSliceStart = blobData[0].length + blobData[1].length;
   let firstSliceEnd = firstSliceStart + blobData[2].length;
 

dom/ipc/tests/test_blob_sliced_from_parent_process.html

@@ -9,6 +9,7 @@
   <body onload="setup();">
     <script type="application/javascript">
 "use strict";
+/* eslint-env mozilla/frame-script */
 
 function childFrameScript() {
   "use strict";
@@ -105,7 +106,6 @@ function childFrameScript() {
 function parentFrameScript(mm) {
   const messageName = "test:blob-slice-test";
   const blobData = ["So", " ", "many", " ", "blobs!"];
-  const blobText = blobData.join("");
   const blobType = "text/plain";
 
   const sliceText = "an";

dom/ipc/tests/test_bug1086684.html

@@ -11,6 +11,7 @@
 
   <script type="application/javascript">
     "use strict";
+    /* eslint-env mozilla/frame-script */
 
     SimpleTest.waitForExplicitFinish();
 

dom/ipc/tests/test_child_docshell.html

@@ -10,6 +10,7 @@
 
 <script type="application/javascript">
 "use strict";
+/* eslint-env mozilla/frame-script */
 
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.addPermission("browser", true, document);
@@ -46,9 +47,6 @@ SpecialPowers.pushPrefEnv({"set": [
   });
   // Inject a frame script in the child process:
   mm.loadFrameScript("data:,new " + function ContentScriptScope() {
-    var processType = Cc["@mozilla.org/xre/runtime;1"]
-                        .getService(Ci.nsIXULRuntime)
-                        .processType;
     var chromeEventHandler = docShell.chromeEventHandler;
     sendAsyncMessage("chromeEventHandler", {
       processType: Services.appinfo.processType,

dom/ipc/tests/test_cpow_cookies.html

@@ -11,6 +11,7 @@
 
   <script type="application/javascript">
     "use strict";
+    /* eslint-env mozilla/frame-script */
 
     SimpleTest.waitForExplicitFinish();
 

dom/ipc/tests/test_temporaryfile_stream.html

@@ -16,6 +16,8 @@ function startTest() {
   canvas.width = canvas.height = 100;
   document.getElementById("content").appendChild(canvas);
 
+
+  // eslint-disable-next-line no-undef
   var helper = new CaptureStreamTestHelper2D(100, 100);
   helper.drawColor(canvas, helper.red);
 
@@ -23,7 +25,7 @@ function startTest() {
 
   var blob;
 
-  mediaRecorder = new MediaRecorder(stream);
+  let mediaRecorder = new MediaRecorder(stream);
   is(mediaRecorder.stream, stream,
      "Media recorder stream = canvas stream at the start of recording");