Backed out 5 changesets (bug 1769569) for causing devtools' browser/browser_page_redirection.js to fail. CLOSED TREE

Backed out changeset 66a42eb3a366 (bug 1769569)
Backed out changeset d3cc9629cd9a (bug 1769569)
Backed out changeset edcd3dade079 (bug 1769569)
Backed out changeset 29d8dd058b7a (bug 1769569)
Backed out changeset 1aed34fdf2d3 (bug 1769569)

.eslintrc.js

@@ -96,14 +96,17 @@ module.exports = {
       files: "*.sjs",
       rules: {
         complexity: "warn",
+        "no-undef": "warn",
         "no-empty": "warn",
         "no-shadow": "warn",
         "no-redeclare": "warn",
+        "no-unused-vars": "warn",
         "no-fallthrough": "warn",
         "no-control-regex": "warn",
         "no-throw-literal": "warn",
         "no-useless-concat": "warn",
         "consistent-return": "warn",
+        "mozilla/use-cc-etc": "warn",
         "mozilla/use-services": "warn",
         "mozilla/use-includes-instead-of-indexOf": "warn",
         "mozilla/no-compare-against-boolean-literals": "warn",

accessible/tests/mochitest/events/slow_image.sjs

@@ -12,7 +12,7 @@ const IMG_BYTES = atob(
 
 // stolen from file_blocked_script.sjs
 function setGlobalState(data, key) {
-  let x = {
+  x = {
     data,
     QueryInterface: ChromeUtils.generateQI([]),
   };

browser/base/content/test/general/refresh_header.sjs

@@ -11,7 +11,7 @@
  * ?p=http%3A%2F%2Fexample.org%2Fbrowser%2Fbrowser%2Fbase%2Fcontent%2Ftest%2Fgeneral%2Frefresh_meta.sjs&d=200
  */
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   let page = query.get("p");

browser/base/content/test/general/refresh_meta.sjs

@@ -11,7 +11,7 @@
  * ?p=http%3A%2F%2Fexample.org%2Fbrowser%2Fbrowser%2Fbase%2Fcontent%2Ftest%2Fgeneral%2Frefresh_meta.sjs&d=200
  */
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   let page = query.get("p");

browser/base/content/test/referrer/file_referrer_policyserver.sjs

@@ -4,7 +4,7 @@
  * Arguments: ?scheme=http://&policy=origin&rel=noreferrer
  */
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   let scheme = query.get("scheme");

browser/base/content/test/referrer/file_referrer_policyserver_attr.sjs

@@ -4,7 +4,7 @@
  * Arguments: ?scheme=http://&policy=origin&rel=noreferrer
  */
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   let scheme = query.get("scheme");

browser/components/contextualidentity/test/browser/saveLink.sjs

@@ -3,7 +3,7 @@ const HTTPS_ORIGIN = "https://example.com";
 const URI_PATH =
   "/browser/browser/components/contextualidentity/test/browser/saveLink.sjs";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(aRequest, aResponse) {
   var params = new URLSearchParams(aRequest.queryString);

browser/components/extensions/test/browser/file_inspectedwindow_reload_target.sjs

@@ -2,7 +2,7 @@
 /* vim: set sts=2 sw=2 et tw=80 ft=javascript: */
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(request, response) {
   let params = new URLSearchParams(request.queryString);

browser/components/originattributes/test/browser/file_saveAs.sjs

@@ -8,7 +8,7 @@ const VIDEO_PATH = `${URI_PATH}file_thirdPartyChild.video.ogv`;
 const IMAGE_PATH = `${URI_PATH}file_favicon.png`;
 const FRAME_PATH = `${SECOND_ORIGIN}${URI_PATH}file_saveAs.sjs?image=1`;
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(aRequest, aResponse) {
   var params = new URLSearchParams(aRequest.queryString);

browser/components/resistfingerprinting/test/browser/coop_header.sjs

@@ -56,7 +56,7 @@ const WORKER = `
   `;
 
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   if (query.get("crossOriginIsolated") === "true") {

browser/components/resistfingerprinting/test/browser/file_keyBoardEvent.sjs

@@ -1,6 +1,6 @@
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 const HTML_DATA = `
   <!DOCTYPE HTML>

browser/components/sessionstore/test/coopHeaderCommon.sjs

@@ -1,5 +1,5 @@
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
   let query = new URLSearchParams(request.queryString);
 
@@ -15,9 +15,9 @@ function handleRequest(request, response) {
   });
 
   // Set up the file streams to read in the file as UTF-8
-  let fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
-  );
+  let fstream = Components.classes[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Components.interfaces.nsIFileInputStream);
 
   fstream.init(file, -1, 0, 0);
 

devtools/.eslintrc.js

@@ -110,7 +110,6 @@ module.exports = {
       excludedFiles: [
         // Enable the rule on JSM, test head files and some specific files.
         "**/*.jsm",
-        "**/*.sjs",
         "**/test/**/head.js",
         "**/test/**/shared-head.js",
         "client/debugger/test/mochitest/code_frame-script.js",

devtools/client/netmonitor/test/sjs_content-type-test-server.sjs

@@ -3,6 +3,7 @@
 
 "use strict";
 
+/* eslint-disable-next-line mozilla/reject-importGlobalProperties */
 Cu.importGlobalProperties(["TextEncoder"]);
 
 function gzipCompressString(string, obs) {

devtools/client/netmonitor/test/sjs_slow-script-server.sjs

@@ -1,5 +1,8 @@
 "use strict";
 
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
 let timer;
 
 const DELAY_MS = 2000;

devtools/client/netmonitor/test/sjs_slow-test-server.sjs

@@ -1,5 +1,8 @@
 "use strict";
 
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
 let timer;
 
 const DELAY_MS = 10000;

devtools/client/responsive/test/browser/doc_with_remote_iframe_and_isolated_cross_origin_capabilities.sjs

@@ -4,7 +4,7 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "html", false);
 
   // Check the params and set the cross-origin-opener policy headers if needed
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   const query = new URLSearchParams(request.queryString);
   if (query.get("crossOriginIsolated") === "true") {
     response.setHeader("Cross-Origin-Opener-Policy", "same-origin", false);

devtools/client/responsive/test/browser/sjs_redirection.sjs

@@ -4,6 +4,7 @@
 "use strict";
 
 async function handleRequest(request, response) {
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   const query = new URLSearchParams(request.queryString);
 
   const requestUserAgent = request.getHeader("user-agent");

devtools/server/tests/chrome/inspector-delay-image-response.sjs

@@ -32,9 +32,9 @@ function handleRequest(request, response) {
   // If there is a delay, we create a timer which, when it fires, will write
   // image and leave.
   response.processAsync();
-  const nsITimer = Ci.nsITimer;
+  const nsITimer = Components.interfaces.nsITimer;
 
-  timer = Cc["@mozilla.org/timer;1"].createInstance(nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(nsITimer);
   timer.initWithCallback(
     function() {
       response.write(IMAGE);

devtools/shared/commands/inspected-window/tests/inspectedwindow-reload-target.sjs

@@ -1,6 +1,6 @@
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(request, response) {
   const params = new URLSearchParams(request.queryString);

devtools/shared/commands/target-configuration/tests/target_configuration_test_doc.sjs

@@ -4,7 +4,7 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "html", false);
 
   // Check the params and set the cross-origin-opener policy headers if needed
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   const query = new URLSearchParams(request.queryString);
   if (query.get("crossOriginIsolated") === "true") {
     response.setHeader("Cross-Origin-Opener-Policy", "same-origin", false);

docshell/test/mochitest/file_bug475636.sjs

@@ -1,4 +1,4 @@
-let jsURL =
+jsURL =
   "javascript:" +
   escape(
     'window.parent.postMessage("JS uri ran", "*");\
@@ -8,7 +8,7 @@ window.parent.postMessage("Able to access private: " +\
   window.parent.private, "*");\
 </script>\''
   );
-let dataURL =
+dataURL =
   "data:text/html," +
   escape(
     '<!DOCTYPE HTML>\
@@ -23,7 +23,7 @@ catch (e) {\
 </script>'
   );
 
-let tests = [
+tests = [
   // Plain document should work as normal
   '<!DOCTYPE HTML>\
 <script>\
@@ -84,7 +84,7 @@ setTimeout(function() {\
 
 function handleRequest(request, response) {
   dump("@@@@@@@@@hi there: " + request.queryString + "\n");
-  let test = tests[parseInt(request.queryString, 10) - 1];
+  test = tests[parseInt(request.queryString, 10) - 1];
   response.setHeader("Content-Type", "text/html");
 
   if (!test) {

docshell/test/mochitest/form_submit.sjs

@@ -19,7 +19,7 @@ function log(str) {
 
 async function handleRequest(request, response) {
   if (request.method !== "POST") {
-    throw new Error("Expected a post request");
+    message = "bad";
   } else {
     log("Reading request");
     let available = 0;

docshell/test/mochitest/form_submit_redirect.sjs

@@ -1,10 +1,10 @@
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 async function handleRequest(request, response) {
   if (request.method !== "POST") {
-    throw new Error("Expected a post request");
+    message = "bad";
   } else {
     let params = new URLSearchParams(request.queryString);
     let redirect = params.get("redirectTo");

docshell/test/navigation/slow.sjs

@@ -1,13 +1,15 @@
 function handleRequest(request, response) {
   response.processAsync();
 
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.init(
     function() {
       response.finish();
     },
     5000,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 
   response.setStatusLine(null, 200, "OK");

dom/abort/tests/slow.sjs

@@ -1,13 +1,15 @@
 function handleRequest(request, response) {
   response.processAsync();
 
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.init(
     function() {
       response.write("Here the content. But slowly.");
       response.finish();
     },
     1000,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

dom/ipc/tests/blob_verify.sjs

@@ -13,7 +13,6 @@ const BinaryOutputStream = CC(
 function handleRequest(request, response) {
   var bodyStream = new BinaryInputStream(request.bodyInputStream);
   var bodyBytes = [];
-  let bodyAvail;
   while ((bodyAvail = bodyStream.available()) > 0) {
     Array.prototype.push.apply(bodyBytes, bodyStream.readByteArray(bodyAvail));
   }

dom/manifest/test/file_testserver.sjs

@@ -1,18 +1,20 @@
 "use strict";
 let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function loadHTMLFromFile(path) {
   // Load the HTML to return in the response from file.
   // Since it's relative to the cwd of the test runner, we start there and
   // append to get to the actual path of the file.
-  const testHTMLFile = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  const testHTMLFile = Components.classes[
+    "@mozilla.org/file/directory_service;1"
+  ]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
-  const testHTMLFileStream = Cc[
+  const testHTMLFileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
 
   path
     .split("/")

dom/manifest/test/resource.sjs

@@ -20,7 +20,7 @@
  */
 //global handleRequest
 "use strict";
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 const HTTPStatus = new Map([
   [100, "Continue"],
   [101, "Switching Protocol"],

dom/media/test/allowed.sjs

@@ -31,15 +31,15 @@ var types = {
 function handleRequest(request, response) {
   var resource = parseQuery(request, "");
 
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
-  var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
-  );
-  var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
+  var fis = Components.classes[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Components.interfaces.nsIFileInputStream);
+  var bis = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for (var i = 0; i < split.length; ++i) {

dom/media/test/contentType.sjs

@@ -22,15 +22,21 @@ function handleRequest(request, response) {
     // Get the filename to send back.
     var filename = parseQuery(request, "file");
 
-    var file = Cc["@mozilla.org/file/directory_service;1"]
-      .getService(Ci.nsIProperties)
-      .get("CurWorkD", Ci.nsIFile);
-    var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-      Ci.nsIFileInputStream
-    );
-    var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-      Ci.nsIBinaryInputStream
+    const CC = Components.Constructor;
+    const BinaryOutputStream = CC(
+      "@mozilla.org/binaryoutputstream;1",
+      "nsIBinaryOutputStream",
+      "setOutputStream"
     );
+    var file = Components.classes["@mozilla.org/file/directory_service;1"]
+      .getService(Components.interfaces.nsIProperties)
+      .get("CurWorkD", Components.interfaces.nsIFile);
+    var fis = Components.classes[
+      "@mozilla.org/network/file-input-stream;1"
+    ].createInstance(Components.interfaces.nsIFileInputStream);
+    var bis = Components.classes[
+      "@mozilla.org/binaryinputstream;1"
+    ].createInstance(Components.interfaces.nsIBinaryInputStream);
     var paths = "tests/dom/media/test/" + filename;
     dump(paths + "\n");
     var split = paths.split("/");
@@ -56,7 +62,7 @@ function handleRequest(request, response) {
       response.setHeader("Content-Range", contentRange);
     }
 
-    fis.seek(Ci.nsISeekableStream.NS_SEEK_SET, partialstart);
+    fis.seek(Components.interfaces.nsISeekableStream.NS_SEEK_SET, partialstart);
     bis.setInputStream(fis);
 
     var sendContentType = parseQuery(request, "nomime");

dom/media/test/dash_detect_stream_switch.sjs

@@ -64,15 +64,15 @@ function handleRequest(request, response) {
       }
       var startOffset = parseInt(offsets[0]);
       var endOffset = parseInt(offsets[1]);
-      var file = Cc["@mozilla.org/file/directory_service;1"]
-        .getService(Ci.nsIProperties)
-        .get("CurWorkD", Ci.nsIFile);
-      var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-        Ci.nsIFileInputStream
-      );
-      var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-        Ci.nsIBinaryInputStream
-      );
+      var file = Components.classes["@mozilla.org/file/directory_service;1"]
+        .getService(Components.interfaces.nsIProperties)
+        .get("CurWorkD", Components.interfaces.nsIFile);
+      var fis = Components.classes[
+        "@mozilla.org/network/file-input-stream;1"
+      ].createInstance(Components.interfaces.nsIFileInputStream);
+      var bis = Components.classes[
+        "@mozilla.org/binaryinputstream;1"
+      ].createInstance(Components.interfaces.nsIBinaryInputStream);
 
       var paths = "tests/dom/media/test/" + name;
       var split = paths.split("/");
@@ -103,7 +103,10 @@ function handleRequest(request, response) {
         }
         endOffset = file.fileSize - 1;
       }
-      fis.seek(Ci.nsISeekableStream.NS_SEEK_SET, startOffset);
+      fis.seek(
+        Components.interfaces.nsISeekableStream.NS_SEEK_SET,
+        startOffset
+      );
       bis.setInputStream(fis);
 
       var byteLengthToRead = endOffset + 1 - startOffset;

dom/media/test/dynamic_resource.sjs

@@ -25,15 +25,15 @@ function handleRequest(request, response) {
   var resource = getState(key) == "2" ? resource2 : resource1;
   setState(key, "2");
 
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
-  var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
-  );
-  var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
+  var fis = Components.classes[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Components.interfaces.nsIFileInputStream);
+  var bis = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for (var i = 0; i < split.length; ++i) {

dom/media/test/gzipped_mp4.sjs

@@ -3,12 +3,12 @@ function getGzippedFileBytes() {
   getObjectState("SERVER_ROOT", function(serverRoot) {
     file = serverRoot.getFile("tests/dom/media/test/short.mp4.gz");
   });
-  var fileInputStream = Cc[
+  var fileInputStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
-  var binaryInputStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  ].createInstance(Components.interfaces.nsIFileInputStream);
+  var binaryInputStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   fileInputStream.init(file, -1, -1, 0);
   binaryInputStream.setInputStream(fileInputStream);
   return binaryInputStream.readBytes(binaryInputStream.available());

dom/media/test/midflight-redirect.sjs

@@ -19,15 +19,15 @@ function handleRequest(request, response) {
   var redirected = parseQuery(query, "redirected") || false;
   var useCors = parseQuery(query, "cors") || false;
 
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
-  var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
-  );
-  var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
+  var fis = Components.classes[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Components.interfaces.nsIFileInputStream);
+  var bis = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for (var i = 0; i < split.length; ++i) {
@@ -69,7 +69,7 @@ function handleRequest(request, response) {
 
   // Note: 'to' is the first index *excluded*, so we need (to + 1)
   // in the substring end here.
-  let byterange = bytes.substring(from, to + 1);
+  byterange = bytes.substring(from, to + 1);
 
   let contentRange = "bytes " + from + "-" + to + "/" + bytes.length;
   let contentLength = byterange.length.toString();

dom/media/test/referer.sjs

@@ -24,15 +24,15 @@ function handleRequest(request, response) {
   ) {
     var name = parseQuery(request, "name");
     var type = parseQuery(request, "type");
-    var file = Cc["@mozilla.org/file/directory_service;1"]
-      .getService(Ci.nsIProperties)
-      .get("CurWorkD", Ci.nsIFile);
-    var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-      Ci.nsIFileInputStream
-    );
-    var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-      Ci.nsIBinaryInputStream
-    );
+    var file = Components.classes["@mozilla.org/file/directory_service;1"]
+      .getService(Components.interfaces.nsIProperties)
+      .get("CurWorkD", Components.interfaces.nsIFile);
+    var fis = Components.classes[
+      "@mozilla.org/network/file-input-stream;1"
+    ].createInstance(Components.interfaces.nsIFileInputStream);
+    var bis = Components.classes[
+      "@mozilla.org/binaryinputstream;1"
+    ].createInstance(Components.interfaces.nsIBinaryInputStream);
     var paths = "tests/dom/media/test/" + name;
     var split = paths.split("/");
     for (var i = 0; i < split.length; ++i) {

dom/media/test/seekLies.sjs

@@ -1,13 +1,13 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
-  var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
-  );
-  var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
+  var fis = Components.classes[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Components.interfaces.nsIFileInputStream);
+  var bis = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   var paths = "tests/dom/media/test/seek.ogv";
   var split = paths.split("/");
   for (var i = 0; i < split.length; ++i) {

dom/reporting/tests/delivering.sjs

@@ -5,7 +5,7 @@ const BinaryInputStream = CC(
   "setInputStream"
 );
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(aRequest, aResponse) {
   var params = new URLSearchParams(aRequest.queryString);

dom/security/test/general/file_block_script_wrong_mime_server.sjs

@@ -2,7 +2,7 @@
 // Bug 1288361 - Block scripts with wrong MIME type
 
 "use strict";
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 const WORKER = `
   onmessage = function(event) {

dom/security/test/general/file_nosniff_testserver.sjs

@@ -1,5 +1,5 @@
 "use strict";
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 const SCRIPT = "var foo = 24;";
 const CSS = "body { background-color: green; }";

dom/security/test/https-only/file_user_suggestion_box.sjs

@@ -15,6 +15,7 @@ function handleRequest(request, response) {
   if (request.host.startsWith("www.")) {
     // in this test all pages that can be reached via https must have www.
     response.write("You are now on the secure www. page");
+    createIframe();
     return;
   }
   // in this test there should not be a secure connection to a site without www.

dom/security/test/referrer-policy/referrer_page.sjs

@@ -1,4 +1,4 @@
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(request, response) {
   let params = new URLSearchParams(request.queryString);

dom/security/test/referrer-policy/referrer_testserver.sjs

@@ -5,7 +5,7 @@
  * bug 1174913, bug 1175736, bug 1184781
  */
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 const SJS = "referrer_testserver.sjs?";
 const SJS_PATH = "/tests/dom/security/test/referrer-policy/";
 const BASE_ORIGIN = "example.com";

dom/svg/test/object-delayed-intrinsic-size.sjs

@@ -10,7 +10,9 @@ function handleRequest(request, response) {
   // while waiting for the rest of the document to load:
   response.bodyOutputStream.write("\n", 1);
 
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       var body =
@@ -19,6 +21,6 @@ function handleRequest(request, response) {
       response.finish();
     },
     1000 /* milliseconds */,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

dom/xhr/tests/file_XHR_timeout.sjs

@@ -2,7 +2,9 @@ var timer = null;
 
 function handleRequest(request, response) {
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.setStatusLine(null, 200, "OK");
@@ -11,6 +13,6 @@ function handleRequest(request, response) {
       response.finish();
     },
     3000 /* milliseconds */,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

dom/xhr/tests/responseIdentical.sjs

@@ -9,7 +9,8 @@ const BinaryInputStream = CC(
 function handleRequest(request, response) {
   var body = "";
   var bodyStream = new BinaryInputStream(request.bodyInputStream);
-  var avail = 0;
+  var bytes = [],
+    avail = 0;
   while ((avail = bodyStream.available()) > 0) {
     body += String.fromCharCode.apply(String, bodyStream.readByteArray(avail));
   }

dom/xhr/tests/slow.sjs

@@ -1,13 +1,15 @@
 function handleRequest(request, response) {
   response.processAsync();
 
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.init(
     function() {
       response.write("Here the content. But slowly.");
       response.finish();
     },
     5000,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

dom/xhr/tests/sync_xhr_unload.sjs

@@ -2,7 +2,9 @@ var timer = null;
 
 function handleRequest(request, response) {
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.setStatusLine(null, 200, "OK");
@@ -11,6 +13,6 @@ function handleRequest(request, response) {
       response.finish();
     },
     30000 /* milliseconds */,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

dom/xhr/tests/temporaryFileBlob.sjs

@@ -15,7 +15,6 @@ const Timer = CC("@mozilla.org/timer;1", "nsITimer", "initWithCallback");
 function handleRequest(request, response) {
   var bodyStream = new BinaryInputStream(request.bodyInputStream);
   var bodyBytes = [];
-  let bodyAvail;
   while ((bodyAvail = bodyStream.available()) > 0) {
     Array.prototype.push.apply(bodyBytes, bodyStream.readByteArray(bodyAvail));
   }
@@ -32,7 +31,7 @@ function handleRequest(request, response) {
       bos.writeByteArray(bodyBytes);
     },
     1000,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 
   response.timer2 = new Timer(
@@ -40,6 +39,6 @@ function handleRequest(request, response) {
       response.finish();
     },
     2000,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

image/test/mochitest/bug1180105-waiter.sjs

@@ -2,8 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-var timer = Cc["@mozilla.org/timer;1"];
-var waitTimer = timer.createInstance(Ci.nsITimer);
+var timer = Components.classes["@mozilla.org/timer;1"];
+var waitTimer = timer.createInstance(Components.interfaces.nsITimer);
 
 function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/html", false);
@@ -23,7 +23,7 @@ function waitForFinish(response) {
         waitForFinish(response);
       },
       10,
-      Ci.nsITimer.TYPE_ONE_SHOT
+      Components.interfaces.nsITimer.TYPE_ONE_SHOT
     );
   }
 }

image/test/mochitest/bug1180105.sjs

@@ -3,13 +3,13 @@
  */
 
 var counter = 100;
-var timer = Cc["@mozilla.org/timer;1"];
-var partTimer = timer.createInstance(Ci.nsITimer);
+var timer = Components.classes["@mozilla.org/timer;1"];
+var partTimer = timer.createInstance(Components.interfaces.nsITimer);
 
 function getFileAsInputStream(aFilename) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -17,9 +17,9 @@ function getFileAsInputStream(aFilename) {
   file.append("mochitest");
   file.append(aFilename);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
   return fileStream;
 }
@@ -50,7 +50,7 @@ function sendParts(response) {
       sendParts(response);
     },
     1,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }
 

image/test/mochitest/bug490949.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -18,13 +18,13 @@ function handleRequest(request, response) {
   }
   response.setHeader("Cache-Control", "no-cache", false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
-  var binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var binaryStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   binaryStream.setInputStream(fileStream);
 
   response.bodyOutputStream.writeFrom(binaryStream, binaryStream.available());

image/test/mochitest/bug496292-1.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -17,13 +17,13 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "image/png", false);
   response.setHeader("Cache-Control", "no-cache", false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
-  var binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var binaryStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   binaryStream.setInputStream(fileStream);
 
   response.bodyOutputStream.writeFrom(binaryStream, binaryStream.available());

image/test/mochitest/bug496292-2.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -17,13 +17,13 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "image/png", false);
   response.setHeader("Cache-Control", "no-cache", false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
-  var binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var binaryStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   binaryStream.setInputStream(fileStream);
 
   response.bodyOutputStream.writeFrom(binaryStream, binaryStream.available());

image/test/mochitest/bug497665.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -19,13 +19,13 @@ function handleRequest(request, response) {
 
   response.setHeader("Cache-Control", "max-age=3600", false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
-  var binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var binaryStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   binaryStream.setInputStream(fileStream);
 
   response.bodyOutputStream.writeFrom(binaryStream, binaryStream.available());

image/test/mochitest/bug657191.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -12,13 +12,13 @@ function handleRequest(request, response) {
   response.setStatusLine("1.1", 500, "Internal Server Error");
   response.setHeader("Content-Type", "image/svg+xml", false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
-  var binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
-    Ci.nsIBinaryInputStream
-  );
+  var binaryStream = Components.classes[
+    "@mozilla.org/binaryinputstream;1"
+  ].createInstance(Components.interfaces.nsIBinaryInputStream);
   binaryStream.setInputStream(fileStream);
 
   response.bodyOutputStream.writeFrom(binaryStream, binaryStream.available());

image/test/mochitest/bug671906.sjs

@@ -1,7 +1,7 @@
 function handleRequest(request, response) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -23,9 +23,9 @@ function handleRequest(request, response) {
   date.setFullYear(date.getFullYear() + 1);
   response.setHeader("Expires", date.toUTCString(), false);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
 
   response.bodyOutputStream.writeFrom(fileStream, fileStream.available());

image/test/mochitest/bug733553.sjs

@@ -24,13 +24,13 @@ var bodyParts = [
   ["invalid.jpg", "image/jpeg"],
   ["animated-gif2.gif", "image/gif"],
 ];
-var timer = Cc["@mozilla.org/timer;1"];
-var partTimer = timer.createInstance(Ci.nsITimer);
+var timer = Components.classes["@mozilla.org/timer;1"];
+var partTimer = timer.createInstance(Components.interfaces.nsITimer);
 
 function getFileAsInputStream(aFilename) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -38,9 +38,9 @@ function getFileAsInputStream(aFilename) {
   file.append("mochitest");
   file.append(aFilename);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
   return fileStream;
 }
@@ -80,7 +80,11 @@ function sendParts(response) {
         sendParts(response);
       };
     }
-    partTimer.initWithCallback(callback, 1000, Ci.nsITimer.TYPE_ONE_SHOT);
+    partTimer.initWithCallback(
+      callback,
+      1000,
+      Components.interfaces.nsITimer.TYPE_ONE_SHOT
+    );
   } else {
     sendClose(response);
   }

image/test/mochitest/bug767779.sjs

@@ -2,13 +2,13 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-var timer = Cc["@mozilla.org/timer;1"];
-var partTimer = timer.createInstance(Ci.nsITimer);
+var timer = Components.classes["@mozilla.org/timer;1"];
+var partTimer = timer.createInstance(Components.interfaces.nsITimer);
 
 function getFileAsInputStream(aFilename) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -16,9 +16,9 @@ function getFileAsInputStream(aFilename) {
   file.append("mochitest");
   file.append(aFilename);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
   return fileStream;
 }
@@ -30,7 +30,7 @@ function handleRequest(request, response) {
   // We're sending data off in a delayed fashion
   response.processAsync();
   var inputStream = getFileAsInputStream("animated-gif_trailing-garbage.gif");
-  // Should be 4029 bytes available.
+  var available = inputStream.available(); // = 4029 bytes
   // Send the good data at once
   response.bodyOutputStream.writeFrom(inputStream, 285);
   sendParts(inputStream, response);
@@ -41,7 +41,7 @@ function sendParts(inputStream, response) {
   partTimer.initWithCallback(
     getSendNextPart(inputStream, response),
     500,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }
 

image/test/mochitest/webcam-simulacrum.sjs

@@ -4,13 +4,13 @@
 
 var counter = 2;
 var frames = ["red.gif", "blue.gif"];
-var timer = Cc["@mozilla.org/timer;1"];
-var partTimer = timer.createInstance(Ci.nsITimer);
+var timer = Components.classes["@mozilla.org/timer;1"];
+var partTimer = timer.createInstance(Components.interfaces.nsITimer);
 
 function getFileAsInputStream(aFilename) {
-  var file = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
 
   file.append("tests");
   file.append("image");
@@ -18,9 +18,9 @@ function getFileAsInputStream(aFilename) {
   file.append("mochitest");
   file.append(aFilename);
 
-  var fileStream = Cc[
+  var fileStream = Components.classes[
     "@mozilla.org/network/file-input-stream;1"
-  ].createInstance(Ci.nsIFileInputStream);
+  ].createInstance(Components.interfaces.nsIFileInputStream);
   fileStream.init(file, 1, 0, false);
   return fileStream;
 }

layout/base/tests/file_bug842853.sjs

@@ -5,12 +5,14 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/css", false);
   response.write("body { background:lime; color:red; }");
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.finish();
     },
     500,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

layout/generic/test/file_IconTestServer.sjs

@@ -47,10 +47,10 @@ function handleRequest(request, response) {
   // Context structure - we need to set this up properly to pass to setObjectState
   var ctx = {
     QueryInterface: function(iid) {
-      if (iid.equals(Ci.nsISupports)) {
+      if (iid.equals(Components.interfaces.nsISupports)) {
         return this;
       }
-      throw Components.Exception("", Cr.NS_ERROR_NO_INTERFACE);
+      throw Components.Exception("", Components.results.NS_ERROR_NO_INTERFACE);
     },
   };
   ctx.wrappedJSObject = ctx;
@@ -65,9 +65,9 @@ function handleRequest(request, response) {
   ctx.ostream = response.bodyOutputStream;
 
   // Ugly hack, but effective - copied from dom/media/test/contentDuration1.sjs
-  var pngFile = Cc["@mozilla.org/file/directory_service;1"]
-    .getService(Ci.nsIProperties)
-    .get("CurWorkD", Ci.nsIFile);
+  var pngFile = Components.classes["@mozilla.org/file/directory_service;1"]
+    .getService(Components.interfaces.nsIProperties)
+    .get("CurWorkD", Components.interfaces.nsIFile);
   var paths = "tests/layout/generic/test/file_Dolske.png";
   var split = paths.split("/");
   for (var i = 0; i < split.length; ++i) {
@@ -76,7 +76,7 @@ function handleRequest(request, response) {
 
   // Get an input stream for the png data
   ctx.istream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
-    Ci.nsIFileInputStream
+    Components.interfaces.nsIFileInputStream
   );
   ctx.istream.init(pngFile, -1, 0, 0);
 

layout/generic/test/file_SlowImage.sjs

@@ -12,10 +12,13 @@ function handleRequest(request, response) {
     if (obj == null) {
       ctx = {
         QueryInterface: function(iid) {
-          if (iid.equals(Ci.nsISupports)) {
+          if (iid.equals(Components.interfaces.nsISupports)) {
             return this;
           }
-          throw Components.Exception("", Cr.NS_ERROR_NO_INTERFACE);
+          throw Components.Exception(
+            "",
+            Components.results.NS_ERROR_NO_INTERFACE
+          );
         },
       };
       ctx.wrappedJSObject = ctx;

netwerk/cookie/test/mochitest/cookie.sjs

@@ -119,8 +119,6 @@ function handleRequest(aRequest, aResponse) {
       })
     );
 
-    // This function is exported as a string.
-    /* eslint-disable no-undef */
     function w() {
       onconnect = e => {
         e.ports[0].onmessage = evt => {
@@ -147,7 +145,6 @@ function handleRequest(aRequest, aResponse) {
         e.ports[0].postMessage(42);
       };
     }
-    /* eslint-enable no-undef */
 
     aResponse.setHeader("Content-Type", "text/javascript", false);
     aResponse.write(w.toString() + "; w();");

netwerk/test/mochitests/partial_content.sjs

@@ -136,7 +136,7 @@ function handleRequest(request, response) {
   DBG("totalLength: " + totalLength);
 
   // Prepare common headers for the two responses.
-  let date = new Date();
+  date = new Date();
   DBG("Date: " + date.toUTCString() + ", Last-Modified: " + lastModified);
   var commonHeaders =
     "Date: " +

parser/htmlparser/tests/mochitest/file_async_bug1104732.sjs

@@ -5,7 +5,9 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "application/javascript", false);
   response.write("asyncState = 'mid-async';\n");
 
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.write("asyncState = 'loaded';\n");

parser/htmlparser/tests/mochitest/file_bug534293-slow.sjs

@@ -5,12 +5,14 @@ function handleRequest(request, response) {
   response.setHeader("Content-Type", "text/javascript", false);
   response.write("ok(true, 'Slow script ran.');");
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.finish();
     },
     500,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

parser/htmlparser/tests/mochitest/file_bug543062.sjs

@@ -1,7 +1,9 @@
 var timer;
 
 function armTimer(response) {
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       if (
@@ -17,7 +19,7 @@ function armTimer(response) {
       }
     },
     20,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }
 

parser/htmlparser/tests/mochitest/file_bug568470-script.sjs

@@ -6,12 +6,14 @@ function handleRequest(request, response) {
   response.write("var i = 0;");
   response.bodyOutputStream.flush();
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.finish();
     },
     500,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

parser/htmlparser/tests/mochitest/file_bug568470.sjs

@@ -11,12 +11,14 @@ function handleRequest(request, response) {
   response.write("</div>");
   response.bodyOutputStream.flush();
   response.processAsync();
-  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+    Components.interfaces.nsITimer
+  );
   timer.initWithCallback(
     function() {
       response.finish();
     },
     1200,
-    Ci.nsITimer.TYPE_ONE_SHOT
+    Components.interfaces.nsITimer.TYPE_ONE_SHOT
   );
 }

parser/htmlparser/tests/mochitest/file_bug655682.sjs

@@ -16,16 +16,26 @@ function handleRequest(request, response) {
     response.setHeader("Content-Type", "text/html; charset=utf-8", false);
     response.write("<table><tr><td>A</td>     ");
     response.bodyOutputStream.flush();
-    timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+      Components.interfaces.nsITimer
+    );
 
     callback = function() {
       if (getState("triggered") == "triggered") {
         response.write("<td>B</td></tr></table>");
         response.finish();
       } else {
-        timer.initWithCallback(callback, 10, Ci.nsITimer.TYPE_ONE_SHOT);
+        timer.initWithCallback(
+          callback,
+          10,
+          Components.interfaces.nsITimer.TYPE_ONE_SHOT
+        );
       }
     };
-    timer.initWithCallback(callback, 10, Ci.nsITimer.TYPE_ONE_SHOT);
+    timer.initWithCallback(
+      callback,
+      10,
+      Components.interfaces.nsITimer.TYPE_ONE_SHOT
+    );
   }
 }

services/fxaccounts/tests/mochitest/file_invalidEmailCase.sjs

@@ -76,6 +76,6 @@ function handleRequest(request, response) {
       break;
   }
 
-  let messageStr = JSON.stringify(message);
+  messageStr = JSON.stringify(message);
   response.bodyOutputStream.write(messageStr, messageStr.length);
 }

toolkit/components/antitracking/test/browser/browser_staticPartition_CORS_preflight.sjs

@@ -4,7 +4,7 @@
 
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(request, response) {
   let query = new URLSearchParams(request.queryString);

toolkit/components/cleardata/tests/browser/file_cors_preflight.sjs

@@ -4,7 +4,7 @@
 
 "use strict";
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function handleRequest(request, response) {
   let query = new URLSearchParams(request.queryString);

toolkit/components/extensions/test/mochitest/redirect_auto.sjs

@@ -2,7 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 "use strict";
-Cu.importGlobalProperties(["URLSearchParams", "URL"]);
+Components.utils.importGlobalProperties(["URLSearchParams", "URL"]);
 
 function handleRequest(request, response) {
   let params = new URLSearchParams(request.queryString);

toolkit/components/remotebrowserutils/tests/browser/coop_header.sjs

@@ -1,5 +1,5 @@
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let query = new URLSearchParams(request.queryString);
 
   response.setStatusLine(request.httpVersion, 200, "OK");

toolkit/components/thumbnails/test/thumbnails_background.sjs

@@ -78,14 +78,16 @@ function handleRequest(req, resp) {
 
   if (opts.wait) {
     resp.write("Waiting " + opts.wait + " ms... ");
-    timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    timer = Components.classes["@mozilla.org/timer;1"].createInstance(
+      Components.interfaces.nsITimer
+    );
     timer.init(
       function ding() {
         resp.write("OK!");
         resp.finish();
       },
       opts.wait,
-      Ci.nsITimer.TYPE_ONE_SHOT
+      Components.interfaces.nsITimer.TYPE_ONE_SHOT
     );
     return;
   }

toolkit/components/url-classifier/tests/mochitest/report.sjs

@@ -6,7 +6,7 @@ const REDIRECT =
   "mochi.test:8888/chrome/toolkit/components/url-classifier/tests/mochitest/" +
   SJS;
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 function createBlockedIframePage() {
   return `<!DOCTYPE HTML>

toolkit/components/url-classifier/tests/mochitest/threathit.sjs

@@ -9,7 +9,7 @@ const BinaryInputStream = CC(
 );
 
 function handleRequest(request, response) {
-  Cu.importGlobalProperties(["URLSearchParams"]);
+  Components.utils.importGlobalProperties(["URLSearchParams"]);
   let params = new URLSearchParams(request.queryString);
   var action = params.get("action");
 

toolkit/components/url-classifier/tests/mochitest/trackerFrame.sjs

@@ -2,7 +2,7 @@
  * 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/. */
 
-Cu.importGlobalProperties(["URLSearchParams"]);
+Components.utils.importGlobalProperties(["URLSearchParams"]);
 
 const stateTotalRequests = "total-request";
 const stateCallback = "callback-response";

toolkit/content/tests/browser/data/post_form_inner.sjs

@@ -15,7 +15,8 @@ function handleRequest(request, response) {
     Inner POST data: ";
 
   var bodyStream = new BinaryInputStream(request.bodyInputStream);
-  var avail = 0;
+  var bytes = [],
+    avail = 0;
   while ((avail = bodyStream.available()) > 0) {
     body += String.fromCharCode.apply(String, bodyStream.readByteArray(avail));
   }

toolkit/content/tests/browser/data/post_form_outer.sjs

@@ -15,7 +15,8 @@ function handleRequest(request, response) {
     Outer POST data: ";
 
   var bodyStream = new BinaryInputStream(request.bodyInputStream);
-  var avail = 0;
+  var bytes = [],
+    avail = 0;
   while ((avail = bodyStream.available()) > 0) {
     body += String.fromCharCode.apply(String, bodyStream.readByteArray(avail));
   }

toolkit/crashreporter/test/browser/crashreport.sjs

@@ -10,8 +10,10 @@ function parseHeaders(data, start) {
   let headers = {};
 
   while (true) {
+    let done = false;
     let end = data.indexOf("\r\n", start);
     if (end == -1) {
+      done = true;
       end = data.length;
     }
     let line = data.substring(start, end);
@@ -65,11 +67,13 @@ function parseMultipartForm(request) {
     data += String.fromCharCode(b);
   }
   let formData = {};
+  let done = false;
   let start = 0;
   while (true) {
     // read first line
     let end = data.indexOf("\r\n", start);
     if (end == -1) {
+      done = true;
       end = data.length;
     }
 

toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs

@@ -49,6 +49,7 @@ function handleRequest(aRequest, aResponse) {
 
     function complete_download() {
       LOG("Completing download");
+      downloadPaused = false;
 
       try {
         // Doesn't seem to be a sane way to read using OS.File and write to an

tools/lint/eslint/eslint-plugin-mozilla/lib/rules/reject-importGlobalProperties.js

@@ -8,8 +8,6 @@
 
 "use strict";
 
-const path = require("path");
-
 const privilegedGlobals = Object.keys(
   require("../environments/privileged.js").globals
 );
@@ -36,12 +34,7 @@ module.exports = {
   create(context) {
     return {
       CallExpression(node) {
-        if (
-          node.callee.type !== "MemberExpression" ||
-          // TODO Bug 1501127: sjs files have their own sandbox, and do not inherit
-          // the Window backstage pass directly.
-          path.extname(context.getFilename()) == ".sjs"
-        ) {
+        if (node.callee.type !== "MemberExpression") {
           return;
         }
         let memexp = node.callee;

tools/lint/eslint/eslint-plugin-mozilla/lib/rules/use-cc-etc.js

@@ -22,7 +22,6 @@ module.exports = {
         "https://firefox-source-docs.mozilla.org/code-quality/lint/linters/eslint-plugin-mozilla/use-cc-etc.html",
     },
     type: "suggestion",
-    fixable: "code",
   },
 
   create(context) {
@@ -34,17 +33,12 @@ module.exports = {
           node.property.type === "Identifier" &&
           Object.getOwnPropertyNames(componentsMap).includes(node.property.name)
         ) {
-          context.report({
+          context.report(
             node,
-            message: `Use ${
-              componentsMap[node.property.name]
-            } rather than Components.${node.property.name}`,
-            fix: fixer =>
-              fixer.replaceTextRange(
-                [node.range[0], node.range[1]],
-                componentsMap[node.property.name]
-              ),
-          });
+            `Use ${componentsMap[node.property.name]} rather than Components.${
+              node.property.name
+            }`
+          );
         }
       },
     };

tools/lint/eslint/eslint-plugin-mozilla/tests/reject-importGlobalProperties.js

@@ -25,11 +25,6 @@ ruleTester.run("reject-importGlobalProperties", rule, {
       options: ["allownonwebidl"],
       code: "Cu.importGlobalProperties(['fetch'])",
     },
-    {
-      options: ["allownonwebidl"],
-      code: "Cu.importGlobalProperties(['TextEncoder'])",
-      filename: "foo.sjs",
-    },
   ],
   invalid: [
     {
@@ -47,11 +42,5 @@ ruleTester.run("reject-importGlobalProperties", rule, {
       options: ["allownonwebidl"],
       errors: [{ messageId: "unexpectedCallWebIdl" }],
     },
-    {
-      options: ["allownonwebidl"],
-      code: "Cu.importGlobalProperties(['TextEncoder'])",
-      errors: [{ messageId: "unexpectedCallWebIdl" }],
-      filename: "foo.js",
-    },
   ],
 });

tools/lint/eslint/eslint-plugin-mozilla/tests/use-cc-etc.js

@@ -16,10 +16,9 @@ const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
 // Tests
 // ------------------------------------------------------------------------------
 
-function invalidCode(code, originalName, newName, output) {
+function invalidCode(code, originalName, newName) {
   return {
     code,
-    output,
     errors: [
       {
         message: `Use ${newName} rather than ${originalName}`,
@@ -35,26 +34,22 @@ ruleTester.run("use-cc-etc", rule, {
     invalidCode(
       "let foo = Components.classes['bar'];",
       "Components.classes",
-      "Cc",
-      "let foo = Cc['bar'];"
+      "Cc"
     ),
     invalidCode(
       "let bar = Components.interfaces.bar;",
       "Components.interfaces",
-      "Ci",
-      "let bar = Ci.bar;"
+      "Ci"
     ),
     invalidCode(
       "Components.results.NS_ERROR_ILLEGAL_INPUT;",
       "Components.results",
-      "Cr",
-      "Cr.NS_ERROR_ILLEGAL_INPUT;"
+      "Cr"
     ),
     invalidCode(
       "Components.utils.reportError('fake');",
       "Components.utils",
-      "Cu",
-      "Cu.reportError('fake');"
+      "Cu"
     ),
   ],
 });