Bug 1561435 - Format modules/, a=automatic-formatting
authorVictor Porof <vporof@mozilla.com>
Fri, 05 Jul 2019 10:54:01 +0200
changeset 481398 5b0e589285f730c4f2ae3250148d4ada0e72d6b6
parent 481397 d2c1fb7f1c917b6715f3bfe98c71a0f75ddebb7d
child 481399 b0329baff86060df3bfd0f2aecc8ab5381056036
push id36243
push uservporof@mozilla.com
push dateFri, 05 Jul 2019 14:04:25 +0000
treeherdermozilla-central@041abaa4aa85 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatic-formatting
bugs1561435
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1561435 - Format modules/, a=automatic-formatting # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D35916
.eslintrc.js
.prettierignore
modules/libjar/test/unit/test_bug1328865.js
modules/libjar/test/unit/test_bug278262.js
modules/libjar/test/unit/test_bug333423.js
modules/libjar/test/unit/test_bug336691.js
modules/libjar/test/unit/test_bug370103.js
modules/libjar/test/unit/test_bug379841.js
modules/libjar/test/unit/test_bug453254.js
modules/libjar/test/unit/test_bug458158.js
modules/libjar/test/unit/test_bug589292.js
modules/libjar/test/unit/test_bug597702.js
modules/libjar/test/unit/test_bug637286.js
modules/libjar/test/unit/test_bug658093.js
modules/libjar/test/unit/test_corrupt_1211262.js
modules/libjar/test/unit/test_corrupt_536911.js
modules/libjar/test/unit/test_corrupt_541828.js
modules/libjar/test/unit/test_crx.js
modules/libjar/test/unit/test_dirjar_bug525755.js
modules/libjar/test/unit/test_jarchannel.js
modules/libjar/test/unit/test_jarinput_stream_zipreader_reference.js
modules/libjar/test/unit/test_not_found.js
modules/libjar/test/unit/test_umlaute.js
modules/libjar/test/unit/test_uncompressed.js
modules/libjar/zipwriter/test/unit/head_zipwriter.js
modules/libjar/zipwriter/test/unit/test_alignment.js
modules/libjar/zipwriter/test/unit/test_asyncadd.js
modules/libjar/zipwriter/test/unit/test_asyncbadadd.js
modules/libjar/zipwriter/test/unit/test_asyncbadremove.js
modules/libjar/zipwriter/test/unit/test_asyncremove.js
modules/libjar/zipwriter/test/unit/test_bug399727.js
modules/libjar/zipwriter/test/unit/test_bug419769_1.js
modules/libjar/zipwriter/test/unit/test_bug419769_2.js
modules/libjar/zipwriter/test/unit/test_bug425768.js
modules/libjar/zipwriter/test/unit/test_bug433248.js
modules/libjar/zipwriter/test/unit/test_bug446708.js
modules/libjar/zipwriter/test/unit/test_bug467740.js
modules/libjar/zipwriter/test/unit/test_bug717061.js
modules/libjar/zipwriter/test/unit/test_deflatedata.js
modules/libjar/zipwriter/test/unit/test_storedata.js
modules/libjar/zipwriter/test/unit/test_sync.js
modules/libjar/zipwriter/test/unit/test_undochange.js
modules/libjar/zipwriter/test/unit/test_zippermissions.js
modules/libmar/tests/unit/head_libmar.js
modules/libmar/tests/unit/test_create.js
modules/libmar/tests/unit/test_extract.js
modules/libmar/tests/unit/test_sign_verify.js
modules/libpref/test/unit/head_libPrefs.js
modules/libpref/test/unit/test_changeType.js
modules/libpref/test/unit/test_defaultValues.js
modules/libpref/test/unit/test_dirtyPrefs.js
modules/libpref/test/unit/test_libPrefs.js
modules/libpref/test/unit/test_parser.js
modules/libpref/test/unit/test_stickyprefs.js
modules/libpref/test/unit/test_warnings.js
modules/libpref/test/unit_ipc/test_existing_prefs.js
modules/libpref/test/unit_ipc/test_initial_prefs.js
modules/libpref/test/unit_ipc/test_large_pref.js
modules/libpref/test/unit_ipc/test_locked_prefs.js
modules/libpref/test/unit_ipc/test_observed_prefs.js
modules/libpref/test/unit_ipc/test_sharedMap.js
modules/libpref/test/unit_ipc/test_sharedMap_var_caches.js
modules/libpref/test/unit_ipc/test_update_prefs.js
modules/libpref/test/unit_ipc/test_user_default_prefs.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -40,17 +40,16 @@ module.exports = {
     "plugin:mozilla/recommended"
   ],
   "plugins": [
     "mozilla"
   ],
   "overrides": [{
       "files": [
         "devtools/**",
-        "modules/**",
         "mozglue/**",
         "netwerk/**",
         "nsprpub/**",
         "other-licenses/**",
         "parser/**",
         "python/**",
         "remote/**",
         "security/**",
--- a/.prettierignore
+++ b/.prettierignore
@@ -35,17 +35,16 @@ security/manager/ssl/security-prefs.js
 services/common/services-common.js
 services/sync/services-sync.js
 services/sync/tests/unit/prefs_test_prefs_store.js
 testing/marionette/prefs/marionette.js
 toolkit/components/telemetry/datareporting-prefs.js
 toolkit/components/telemetry/healthreport-prefs.js
 
 # Ignore all top-level directories for now.
-modules/**
 mozglue/**
 netwerk/**
 nsprpub/**
 other-licenses/**
 parser/**
 python/**
 remote/**
 security/**
--- a/modules/libjar/test/unit/test_bug1328865.js
+++ b/modules/libjar/test/unit/test_bug1328865.js
@@ -1,40 +1,51 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 "use strict";
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Check that reading non existant inner jars results in the right error
 
 add_task(async function() {
   var file = do_get_file("data/test_bug597702.zip");
   var outerJarBase = "jar:" + Services.io.newFileURI(file).spec + "!/";
-  var goodSpec = "jar:" + outerJarBase + "inner.jar!/hello#!/ignore%20this%20part";
-  var goodChannel = NetUtil.newChannel({uri: goodSpec, loadUsingSystemPrincipal: true});
+  var goodSpec =
+    "jar:" + outerJarBase + "inner.jar!/hello#!/ignore%20this%20part";
+  var goodChannel = NetUtil.newChannel({
+    uri: goodSpec,
+    loadUsingSystemPrincipal: true,
+  });
   var instr = goodChannel.open();
 
   ok(!!instr, "Should be able to open channel");
 });
 
 add_task(async function() {
   var file = do_get_file("data/test_bug597702.zip");
   var outerJarBase = "jar:" + Services.io.newFileURI(file).spec + "!/";
-  var goodSpec = "jar:" + outerJarBase + "inner.jar!/hello?ignore%20this%20part!/";
-  var goodChannel = NetUtil.newChannel({uri: goodSpec, loadUsingSystemPrincipal: true});
+  var goodSpec =
+    "jar:" + outerJarBase + "inner.jar!/hello?ignore%20this%20part!/";
+  var goodChannel = NetUtil.newChannel({
+    uri: goodSpec,
+    loadUsingSystemPrincipal: true,
+  });
   var instr = goodChannel.open();
 
   ok(!!instr, "Should be able to open channel");
 });
 
 add_task(async function() {
   var file = do_get_file("data/test_bug597702.zip");
   var outerJarBase = "jar:" + Services.io.newFileURI(file).spec + "!/";
   var goodSpec = "jar:" + outerJarBase + "inner.jar!/hello?ignore#this!/part";
-  var goodChannel = NetUtil.newChannel({uri: goodSpec, loadUsingSystemPrincipal: true});
+  var goodChannel = NetUtil.newChannel({
+    uri: goodSpec,
+    loadUsingSystemPrincipal: true,
+  });
   var instr = goodChannel.open();
 
   ok(!!instr, "Should be able to open channel");
 });
--- a/modules/libjar/test/unit/test_bug278262.js
+++ b/modules/libjar/test/unit/test_bug278262.js
@@ -1,35 +1,34 @@
 // Regression test for bug 278262 - JAR URIs should resolve relative URIs in the base section.
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const path = "data/test_bug333423.zip";
 
 function test_relative_sub() {
   var ios = Services.io;
   var spec = "jar:" + ios.newFileURI(do_get_file(path)).spec + "!/";
   var base = ios.newURI(spec);
   var uri = ios.newURI("../modules/libjar", null, base);
 
   // This is the URI we expect to see.
-  var expected = "jar:" + ios.newFileURI(do_get_file(path)).spec +
-    "!/modules/libjar";
+  var expected =
+    "jar:" + ios.newFileURI(do_get_file(path)).spec + "!/modules/libjar";
 
   Assert.equal(uri.spec, expected);
 }
 
 function test_relative_base() {
   var ios = Services.io;
   var base = ios.newFileURI(do_get_file("data/empty"));
   var uri = ios.newURI("jar:../" + path + "!/", null, base);
 
   // This is the URI we expect to see.
-  var expected = "jar:" + ios.newFileURI(do_get_file(path)).spec +
-    "!/";
+  var expected = "jar:" + ios.newFileURI(do_get_file(path)).spec + "!/";
 
   Assert.equal(uri.spec, expected);
 }
 
 function run_test() {
   test_relative_sub();
   test_relative_base();
 }
--- a/modules/libjar/test/unit/test_bug333423.js
+++ b/modules/libjar/test/unit/test_bug333423.js
@@ -5,15 +5,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Regression test for bug 333423 - crash enumerating entries of a
 // closed nsIZipReader
 function run_test() {
   // the build script have created the zip we can test on in the current dir.
   var file = do_get_file("data/test_bug333423.zip");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(file);
   zipreader.close();
   var entries = zipreader.findEntries("*.*");
   Assert.ok(!entries.hasMore()); // this shouldn't crash
 }
--- a/modules/libjar/test/unit/test_bug336691.js
+++ b/modules/libjar/test/unit/test_bug336691.js
@@ -1,9 +1,10 @@
 // Regression test for bug 336691 - nsZipArchive::Test shouldn't try to ExtractFile on directories.
 function run_test() {
   var file = do_get_file("data/test_bug336691.zip");
-  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipReader.open(file);
   zipReader.test(null); // We shouldn't crash here.
   zipReader.close();
 }
--- a/modules/libjar/test/unit/test_bug370103.js
+++ b/modules/libjar/test/unit/test_bug370103.js
@@ -1,21 +1,24 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Regression test for bug 370103 - crash when passing a null listener to
 // nsIChannel.asyncOpen
 function run_test() {
   // Compose the jar: url
   var file = do_get_file("data/test_bug370103.jar");
   var url = Services.io.newFileURI(file).spec;
   url = "jar:" + url + "!/test_bug370103";
 
   // Try opening channel with null listener
-  var channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
+  var channel = NetUtil.newChannel({
+    uri: url,
+    loadUsingSystemPrincipal: true,
+  });
 
   var exception = false;
   try {
     channel.asyncOpen(null);
   } catch (e) {
     exception = true;
   }
 
--- a/modules/libjar/test/unit/test_bug379841.js
+++ b/modules/libjar/test/unit/test_bug379841.js
@@ -5,17 +5,19 @@ const path = "data/test_bug379841.zip";
 const MAX_TIME_DIFF = 2000000;
 
 var ENTRY_NAME = "test";
 // Actual time of file was 07 May 2007 13:35:49 UTC
 var ENTRY_TIME = new Date(Date.UTC(2007, 4, 7, 13, 35, 49, 0));
 
 function run_test() {
   var file = do_get_file(path);
-  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipReader.open(file);
   var entry = zipReader.getEntry(ENTRY_NAME);
   var diff = Math.abs(entry.lastModifiedTime - ENTRY_TIME.getTime() * 1000);
   zipReader.close();
-  if (diff >= MAX_TIME_DIFF)
+  if (diff >= MAX_TIME_DIFF) {
     do_throw(diff);
+  }
 }
--- a/modules/libjar/test/unit/test_bug453254.js
+++ b/modules/libjar/test/unit/test_bug453254.js
@@ -1,15 +1,17 @@
 function run_test() {
-  const zipCache = Cc["@mozilla.org/libjar/zip-reader-cache;1"]
-                     .createInstance(Ci.nsIZipReaderCache);
+  const zipCache = Cc["@mozilla.org/libjar/zip-reader-cache;1"].createInstance(
+    Ci.nsIZipReaderCache
+  );
   zipCache.init(1024);
   try {
     zipCache.getZip(null);
     do_throw("Shouldn't get here!");
   } catch (e) {
-    if (!(e instanceof Ci.nsIException &&
-          e.result == Cr.NS_ERROR_INVALID_POINTER)) {
+    if (
+      !(e instanceof Ci.nsIException && e.result == Cr.NS_ERROR_INVALID_POINTER)
+    ) {
       throw e;
     }
     // do nothing, this test passes
   }
 }
--- a/modules/libjar/test/unit/test_bug458158.js
+++ b/modules/libjar/test/unit/test_bug458158.js
@@ -1,14 +1,16 @@
 function run_test() {
-  var zReader = Cc["@mozilla.org/libjar/zip-reader;1"]
-                        .createInstance(Ci.nsIZipReader);
+  var zReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   try {
     zReader.open(null);
     do_throw("Shouldn't get here!");
   } catch (e) {
-    if (!(e instanceof Ci.nsIException &&
-          e.result == Cr.NS_ERROR_NULL_POINTER)) {
+    if (
+      !(e instanceof Ci.nsIException && e.result == Cr.NS_ERROR_NULL_POINTER)
+    ) {
       throw e;
     }
     // do nothing, this test passes
   }
 }
--- a/modules/libjar/test/unit/test_bug589292.js
+++ b/modules/libjar/test/unit/test_bug589292.js
@@ -1,18 +1,22 @@
 // Make sure we behave appropriately when asking for content-disposition
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 const path = "data/test_bug589292.zip";
 
 function run_test() {
-  var spec = "jar:" + Services.io.newFileURI(do_get_file(path)).spec + "!/foo.txt";
-  var channel = NetUtil.newChannel({uri: spec, loadUsingSystemPrincipal: true});
+  var spec =
+    "jar:" + Services.io.newFileURI(do_get_file(path)).spec + "!/foo.txt";
+  var channel = NetUtil.newChannel({
+    uri: spec,
+    loadUsingSystemPrincipal: true,
+  });
   channel.open();
   try {
     channel.contentDisposition;
     Assert.ok(false, "The channel has content disposition?!");
   } catch (e) {
     // This is what we want to happen - there's no underlying channel, so no
     // content-disposition header is available
     Assert.ok(true, "How are you reading this?!");
--- a/modules/libjar/test/unit/test_bug597702.js
+++ b/modules/libjar/test/unit/test_bug597702.js
@@ -1,24 +1,30 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Check that reading non existant inner jars results in the right error
 
 function run_test() {
   var file = do_get_file("data/test_bug597702.zip");
   var outerJarBase = "jar:" + Services.io.newFileURI(file).spec + "!/";
   var goodSpec = "jar:" + outerJarBase + "inner.jar!/hello";
   var badSpec = "jar:" + outerJarBase + "jar_that_isnt_in_the.jar!/hello";
-  var goodChannel = NetUtil.newChannel({uri: goodSpec, loadUsingSystemPrincipal: true});
-  var badChannel = NetUtil.newChannel({uri: badSpec, loadUsingSystemPrincipal: true});
+  var goodChannel = NetUtil.newChannel({
+    uri: goodSpec,
+    loadUsingSystemPrincipal: true,
+  });
+  var badChannel = NetUtil.newChannel({
+    uri: badSpec,
+    loadUsingSystemPrincipal: true,
+  });
 
   try {
     goodChannel.open();
   } catch (e) {
     do_throw("Failed to open file in inner jar");
   }
 
   try {
--- a/modules/libjar/test/unit/test_bug637286.js
+++ b/modules/libjar/test/unit/test_bug637286.js
@@ -1,20 +1,23 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Check that the zip cache can expire entries from nested jars
 
 function open_inner_zip(base, idx) {
   var spec = "jar:" + base + "inner" + idx + ".zip!/foo";
-  var channel = NetUtil.newChannel({uri: spec, loadUsingSystemPrincipal: true});
+  var channel = NetUtil.newChannel({
+    uri: spec,
+    loadUsingSystemPrincipal: true,
+  });
   channel.open();
 }
 
 function run_test() {
   var file = do_get_file("data/test_bug637286.zip");
   var outerJarBase = "jar:" + Services.io.newFileURI(file).spec + "!/";
 
   for (var i = 0; i < 40; i++) {
--- a/modules/libjar/test/unit/test_bug658093.js
+++ b/modules/libjar/test/unit/test_bug658093.js
@@ -1,21 +1,24 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Check that we don't crash on reading a directory entry signature
 
 function run_test() {
   var file = do_get_file("data/test_bug658093.zip");
   var spec = "jar:" + Services.io.newFileURI(file).spec + "!/0000";
-  var channel = NetUtil.newChannel({uri: spec, loadUsingSystemPrincipal: true});
+  var channel = NetUtil.newChannel({
+    uri: spec,
+    loadUsingSystemPrincipal: true,
+  });
   var failed = false;
   try {
     channel.open();
   } catch (e) {
     failed = true;
   }
   Assert.ok(failed);
 }
--- a/modules/libjar/test/unit/test_corrupt_1211262.js
+++ b/modules/libjar/test/unit/test_corrupt_1211262.js
@@ -2,27 +2,27 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Regression test ensuring that that a STORED entry with differing compressed
 // and uncompressed sizes is considered to be corrupt.
 function run_test() {
   var file = do_get_file("data/test_corrupt3.zip");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-    createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(file);
 
   var failed = false;
   for (let entryPath of zipreader.findEntries("*")) {
     let entry = zipreader.getEntry(entryPath);
     if (!entry.isDirectory) {
       try {
         zipreader.getInputStream(entryPath);
       } catch (e) {
         failed = true;
       }
     }
   }
 
   Assert.ok(failed);
 }
-
--- a/modules/libjar/test/unit/test_corrupt_536911.js
+++ b/modules/libjar/test/unit/test_corrupt_536911.js
@@ -10,23 +10,23 @@ function wrapInputStream(input) {
   return wrapper;
 }
 
 // Check that files can be read from after closing zipreader
 function run_test() {
   // the build script have created the zip we can test on in the current dir.
   var file = do_get_file("data/test_corrupt.zip");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(file);
   //  var entries = zipreader.findEntries(null);
   // the signature for file is corrupt, should not segfault
   var failed = false;
   try {
     var stream = wrapInputStream(zipreader.getInputStream("file"));
     stream.read(1024);
   } catch (ex) {
     failed = true;
   }
   Assert.ok(failed);
 }
-
--- a/modules/libjar/test/unit/test_corrupt_541828.js
+++ b/modules/libjar/test/unit/test_corrupt_541828.js
@@ -2,20 +2,20 @@
  * 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/. */
 
 // Check that files can be read from after closing zipreader
 function run_test() {
   // the build script have created the zip we can test on in the current dir.
   var file = do_get_file("data/test_corrupt2.zip");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   var failed = false;
   try {
     zipreader.open(file);
     // corrupt files should trigger an exception
   } catch (ex) {
     failed = true;
   }
   Assert.ok(failed);
 }
-
--- a/modules/libjar/test/unit/test_crx.js
+++ b/modules/libjar/test/unit/test_crx.js
@@ -13,27 +13,31 @@ function wrapInputStream(input) {
 }
 
 // Make sure that we can read from CRX files as if they were ZIP files.
 function run_test() {
   // Note: test_crx_dummy.crx is a dummy crx file created for this test. The
   // public key and signature fields in the header are both empty.
   let file = do_get_file("data/test_crx_dummy.crx");
 
-  let zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-    createInstance(Ci.nsIZipReader);
+  let zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(file);
   // do crc stuff
   function check_archive_crc() {
     zipreader.test(null);
     return true;
   }
   Assert.ok(check_archive_crc());
   zipreader.findEntries(null);
-  let stream = wrapInputStream(zipreader.getInputStream("modules/libjar/test/Makefile.in"));
-  let dirstream = wrapInputStream(zipreader.getInputStream("modules/libjar/test/"));
+  let stream = wrapInputStream(
+    zipreader.getInputStream("modules/libjar/test/Makefile.in")
+  );
+  let dirstream = wrapInputStream(
+    zipreader.getInputStream("modules/libjar/test/")
+  );
   zipreader.close();
   zipreader = null;
   Cu.forceGC();
   Assert.ok(stream.read(1024).length > 0);
   Assert.ok(dirstream.read(100).length > 0);
 }
-
--- a/modules/libjar/test/unit/test_dirjar_bug525755.js
+++ b/modules/libjar/test/unit/test_dirjar_bug525755.js
@@ -4,20 +4,20 @@
  * 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/. */
 
 // Check that we refuse to open weird files
 function run_test() {
   // open a bogus file
   var file = do_get_file("/");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   var failed = false;
   try {
     zipreader.open(file);
   } catch (e) {
     failed = true;
   }
   Assert.ok(failed);
   zipreader = null;
 }
-
--- a/modules/libjar/test/unit/test_jarchannel.js
+++ b/modules/libjar/test/unit/test_jarchannel.js
@@ -1,200 +1,205 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 /**
  * Tests some basic jar channel functionality
  */
 
-
-const {Constructor: ctor} = Components;
+const { Constructor: ctor } = Components;
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 const ios = Services.io;
 const dirSvc = Services.dirsvc;
 const obs = Services.obs;
 
-const nsIBinaryInputStream = ctor("@mozilla.org/binaryinputstream;1",
-                               "nsIBinaryInputStream",
-                               "setInputStream"
-                               );
+const nsIBinaryInputStream = ctor(
+  "@mozilla.org/binaryinputstream;1",
+  "nsIBinaryInputStream",
+  "setInputStream"
+);
 
 const fileBase = "test_bug637286.zip";
 const file = do_get_file("data/" + fileBase);
 const jarBase = "jar:" + ios.newFileURI(file).spec + "!";
 const tmpDir = dirSvc.get("TmpD", Ci.nsIFile);
 
 function Listener(callback) {
-    this._callback = callback;
+  this._callback = callback;
 }
 Listener.prototype = {
-    gotStartRequest: false,
-    available: -1,
-    gotStopRequest: false,
-    QueryInterface: ChromeUtils.generateQI(["nsIRequestObserver"]),
-    onDataAvailable(request, stream, offset, count) {
-        try {
-            this.available = stream.available();
-            Assert.equal(this.available, count);
-            // Need to consume stream to avoid assertion
-            new nsIBinaryInputStream(stream).readBytes(count);
-        } catch (ex) {
-            do_throw(ex);
-        }
-    },
-    onStartRequest(request) {
-        this.gotStartRequest = true;
-    },
-    onStopRequest(request, status) {
-        this.gotStopRequest = true;
-        Assert.equal(status, 0);
-        if (this._callback) {
-            this._callback.call(null, this);
-        }
-    },
+  gotStartRequest: false,
+  available: -1,
+  gotStopRequest: false,
+  QueryInterface: ChromeUtils.generateQI(["nsIRequestObserver"]),
+  onDataAvailable(request, stream, offset, count) {
+    try {
+      this.available = stream.available();
+      Assert.equal(this.available, count);
+      // Need to consume stream to avoid assertion
+      new nsIBinaryInputStream(stream).readBytes(count);
+    } catch (ex) {
+      do_throw(ex);
+    }
+  },
+  onStartRequest(request) {
+    this.gotStartRequest = true;
+  },
+  onStopRequest(request, status) {
+    this.gotStopRequest = true;
+    Assert.equal(status, 0);
+    if (this._callback) {
+      this._callback.call(null, this);
+    }
+  },
 };
 
 /**
  * Basic reading test for asynchronously opened jar channel
  */
 function testAsync() {
-    var uri = jarBase + "/inner40.zip";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
-    Assert.ok(chan.contentLength < 0);
-    chan.asyncOpen(new Listener(function(l) {
-        Assert.ok(chan.contentLength > 0);
-        Assert.ok(l.gotStartRequest);
-        Assert.ok(l.gotStopRequest);
-        Assert.equal(l.available, chan.contentLength);
+  var uri = jarBase + "/inner40.zip";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
+  Assert.ok(chan.contentLength < 0);
+  chan.asyncOpen(
+    new Listener(function(l) {
+      Assert.ok(chan.contentLength > 0);
+      Assert.ok(l.gotStartRequest);
+      Assert.ok(l.gotStopRequest);
+      Assert.equal(l.available, chan.contentLength);
 
-        run_next_test();
-    }));
+      run_next_test();
+    })
+  );
 }
 
 add_test(testAsync);
 // Run same test again so we test the codepath for a zipcache hit
 add_test(testAsync);
 
 /**
  * Basic test for nsIZipReader.
  */
 function testZipEntry() {
   var uri = jarBase + "/inner40.zip";
-  var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true})
-    .QueryInterface(Ci.nsIJARChannel);
+  var chan = NetUtil.newChannel({
+    uri,
+    loadUsingSystemPrincipal: true,
+  }).QueryInterface(Ci.nsIJARChannel);
   var entry = chan.zipEntry;
   Assert.ok(entry.CRC32 == 0x8b635486);
   Assert.ok(entry.realSize == 184);
   run_next_test();
 }
 
 add_test(testZipEntry);
 
-
 /**
  * Basic reading test for synchronously opened jar channels
  */
 add_test(function testSync() {
-    var uri = jarBase + "/inner40.zip";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
-    var stream = chan.open();
-    Assert.ok(chan.contentLength > 0);
-    Assert.equal(stream.available(), chan.contentLength);
-    stream.close();
-    stream.close(); // should still not throw
+  var uri = jarBase + "/inner40.zip";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
+  var stream = chan.open();
+  Assert.ok(chan.contentLength > 0);
+  Assert.equal(stream.available(), chan.contentLength);
+  stream.close();
+  stream.close(); // should still not throw
 
-    run_next_test();
+  run_next_test();
 });
 
-
 /**
  * Basic reading test for synchronously opened, nested jar channels
  */
 add_test(function testSyncNested() {
-    var uri = "jar:" + jarBase + "/inner40.zip!/foo";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
-    var stream = chan.open();
-    Assert.ok(chan.contentLength > 0);
-    Assert.equal(stream.available(), chan.contentLength);
-    stream.close();
-    stream.close(); // should still not throw
+  var uri = "jar:" + jarBase + "/inner40.zip!/foo";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
+  var stream = chan.open();
+  Assert.ok(chan.contentLength > 0);
+  Assert.equal(stream.available(), chan.contentLength);
+  stream.close();
+  stream.close(); // should still not throw
 
-    run_next_test();
+  run_next_test();
 });
 
 /**
  * Basic reading test for asynchronously opened, nested jar channels
  */
 add_test(function testAsyncNested(next) {
-    var uri = "jar:" + jarBase + "/inner40.zip!/foo";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
-    chan.asyncOpen(new Listener(function(l) {
-        Assert.ok(chan.contentLength > 0);
-        Assert.ok(l.gotStartRequest);
-        Assert.ok(l.gotStopRequest);
-        Assert.equal(l.available, chan.contentLength);
+  var uri = "jar:" + jarBase + "/inner40.zip!/foo";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
+  chan.asyncOpen(
+    new Listener(function(l) {
+      Assert.ok(chan.contentLength > 0);
+      Assert.ok(l.gotStartRequest);
+      Assert.ok(l.gotStopRequest);
+      Assert.equal(l.available, chan.contentLength);
 
-        run_next_test();
-    }));
+      run_next_test();
+    })
+  );
 });
 
 /**
  * Verify that file locks are released when closing a synchronously
  * opened jar channel stream
  */
 add_test(function testSyncCloseUnlocks() {
-    var copy = tmpDir.clone();
-    copy.append(fileBase);
-    file.copyTo(copy.parent, copy.leafName);
-    var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
-    var stream = chan.open();
-    Assert.ok(chan.contentLength > 0);
-    stream.close();
+  var copy = tmpDir.clone();
+  copy.append(fileBase);
+  file.copyTo(copy.parent, copy.leafName);
+  var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
+  var stream = chan.open();
+  Assert.ok(chan.contentLength > 0);
+  stream.close();
 
-    // Drop any jar caches
-    obs.notifyObservers(null, "chrome-flush-caches");
+  // Drop any jar caches
+  obs.notifyObservers(null, "chrome-flush-caches");
 
-    try {
-        copy.remove(false);
-    } catch (ex) {
-        do_throw(ex);
-    }
+  try {
+    copy.remove(false);
+  } catch (ex) {
+    do_throw(ex);
+  }
 
-    run_next_test();
+  run_next_test();
 });
 
 /**
  * Verify that file locks are released when closing an asynchronously
  * opened jar channel stream
  */
 add_test(function testAsyncCloseUnlocks() {
-    var copy = tmpDir.clone();
-    copy.append(fileBase);
-    file.copyTo(copy.parent, copy.leafName);
+  var copy = tmpDir.clone();
+  copy.append(fileBase);
+  file.copyTo(copy.parent, copy.leafName);
 
-    var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip";
-    var chan = NetUtil.newChannel({uri, loadUsingSystemPrincipal: true});
+  var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip";
+  var chan = NetUtil.newChannel({ uri, loadUsingSystemPrincipal: true });
 
-    chan.asyncOpen(new Listener(function(l) {
-        Assert.ok(chan.contentLength > 0);
+  chan.asyncOpen(
+    new Listener(function(l) {
+      Assert.ok(chan.contentLength > 0);
 
-        // Drop any jar caches
-        obs.notifyObservers(null, "chrome-flush-caches");
+      // Drop any jar caches
+      obs.notifyObservers(null, "chrome-flush-caches");
 
-        try {
-            copy.remove(false);
-        } catch (ex) {
-            do_throw(ex);
-        }
+      try {
+        copy.remove(false);
+      } catch (ex) {
+        do_throw(ex);
+      }
 
-        run_next_test();
-    }));
+      run_next_test();
+    })
+  );
 });
 
-
 function run_test() {
   return run_next_test();
 }
--- a/modules/libjar/test/unit/test_jarinput_stream_zipreader_reference.js
+++ b/modules/libjar/test/unit/test_jarinput_stream_zipreader_reference.js
@@ -12,27 +12,31 @@ function wrapInputStream(input) {
   return wrapper;
 }
 
 // Check that files can be read from after closing zipreader
 function run_test() {
   // the build script have created the zip we can test on in the current dir.
   var file = do_get_file("data/test_bug333423.zip");
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].
-    createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(file);
   // do crc stuff
   function check_archive_crc() {
     zipreader.test(null);
     return true;
   }
   Assert.ok(check_archive_crc());
   zipreader.findEntries(null);
-  var stream = wrapInputStream(zipreader.getInputStream("modules/libjar/test/Makefile.in"));
-  var dirstream = wrapInputStream(zipreader.getInputStream("modules/libjar/test/"));
+  var stream = wrapInputStream(
+    zipreader.getInputStream("modules/libjar/test/Makefile.in")
+  );
+  var dirstream = wrapInputStream(
+    zipreader.getInputStream("modules/libjar/test/")
+  );
   zipreader.close();
   zipreader = null;
   Cu.forceGC();
   Assert.ok(stream.read(1024).length > 0);
   Assert.ok(dirstream.read(100).length > 0);
 }
-
--- a/modules/libjar/test/unit/test_not_found.js
+++ b/modules/libjar/test/unit/test_not_found.js
@@ -1,19 +1,19 @@
 // Should report file not found on non-existent files
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 const path = "data/test_bug333423.zip";
 
 function run_test() {
   var spec = "jar:" + Services.io.newFileURI(do_get_file(path)).spec + "!/";
   var channel = NetUtil.newChannel({
     uri: spec + "file_that_isnt_in.archive",
     loadUsingSystemPrincipal: true,
   });
   try {
     channel.open();
     do_throw("Failed to report that file doesn't exist");
   } catch (e) {
-      Assert.ok(e.name == "NS_ERROR_FILE_NOT_FOUND");
+    Assert.ok(e.name == "NS_ERROR_FILE_NOT_FOUND");
   }
 }
--- a/modules/libjar/test/unit/test_umlaute.js
+++ b/modules/libjar/test/unit/test_umlaute.js
@@ -1,22 +1,24 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function run_test() {
   var tmpDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
 
   var zipfile = do_get_file("data/test_umlaute.zip");
 
   var testFile = tmpDir.clone();
   testFile.append("test_\u00FC.txt");
   if (testFile.exists()) {
     testFile.remove(false);
   }
 
-  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(Ci.nsIZipReader);
+  var zipreader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipreader.open(zipfile);
 
   var entries = zipreader.findEntries(null);
   Assert.ok(entries.hasMore());
 
   var entryName = entries.getNext();
   Assert.equal(entryName, "test_\u00FC.txt");
 
--- a/modules/libjar/test/unit/test_uncompressed.js
+++ b/modules/libjar/test/unit/test_uncompressed.js
@@ -1,9 +1,10 @@
 // Make sure uncompressed files pass crc
 function run_test() {
   var file = do_get_file("data/uncompressed.zip");
-  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
+  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].createInstance(
+    Ci.nsIZipReader
+  );
   zipReader.open(file);
   zipReader.test("hello");
   zipReader.close();
 }
--- a/modules/libjar/zipwriter/test/unit/head_zipwriter.js
+++ b/modules/libjar/zipwriter/test/unit/head_zipwriter.js
@@ -1,54 +1,61 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 const NS_ERROR_IN_PROGRESS = 2152398863;
 
-const PR_RDONLY      = 0x01;
-const PR_WRONLY      = 0x02;
-const PR_RDWR        = 0x04;
+const PR_RDONLY = 0x01;
+const PR_WRONLY = 0x02;
+const PR_RDWR = 0x04;
 const PR_CREATE_FILE = 0x08;
-const PR_APPEND      = 0x10;
-const PR_TRUNCATE    = 0x20;
-const PR_SYNC        = 0x40;
-const PR_EXCL        = 0x80;
+const PR_APPEND = 0x10;
+const PR_TRUNCATE = 0x20;
+const PR_SYNC = 0x40;
+const PR_EXCL = 0x80;
 
 const ZIP_EOCDR_HEADER_SIZE = 22;
 const ZIP_FILE_HEADER_SIZE = 30;
 const ZIP_CDS_HEADER_SIZE = 46;
 const ZIP_METHOD_STORE = 0;
 const ZIP_METHOD_DEFLATE = 8;
 const ZIP_EXTENDED_TIMESTAMP_SIZE = 9;
 
 const PR_USEC_PER_MSEC = 1000;
-const PR_USEC_PER_SEC  = 1000000;
-const PR_MSEC_PER_SEC  = 1000;
+const PR_USEC_PER_SEC = 1000000;
+const PR_MSEC_PER_SEC = 1000;
 
 const DATA_DIR = "data/";
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var ioSvc = Services.io;
 
-var ZipWriter = Components.Constructor("@mozilla.org/zipwriter;1",
-  "nsIZipWriter");
-var ZipReader = Components.Constructor("@mozilla.org/libjar/zip-reader;1",
-  "nsIZipReader", "open");
+var ZipWriter = Components.Constructor(
+  "@mozilla.org/zipwriter;1",
+  "nsIZipWriter"
+);
+var ZipReader = Components.Constructor(
+  "@mozilla.org/libjar/zip-reader;1",
+  "nsIZipReader",
+  "open"
+);
 
 var tmpDir = do_get_profile();
 var tmpFile = tmpDir.clone();
 tmpFile.append("zipwriter-test.zip");
-if (tmpFile.exists())
+if (tmpFile.exists()) {
   tmpFile.remove(true);
+}
 
 var zipW = new ZipWriter();
 
 registerCleanupFunction(function() {
   try {
     zipW.close();
   } catch (e) {
     // Just ignore a failure here and attempt to delete the file anyway.
   }
-  if (tmpFile.exists())
+  if (tmpFile.exists()) {
     tmpFile.remove(true);
+  }
 });
--- a/modules/libjar/zipwriter/test/unit/test_alignment.js
+++ b/modules/libjar/zipwriter/test/unit/test_alignment.js
@@ -15,71 +15,81 @@ var TESTS = [
   },
   {
     name: "test.png",
     compression: Ci.nsIZipWriter.COMPRESSION_NONE,
   },
 ];
 
 function swap16(n) {
-  return (((n >> 8) & 0xFF) << 0) |
-    (((n >> 0) & 0xFF) << 8);
+  return (((n >> 8) & 0xff) << 0) | (((n >> 0) & 0xff) << 8);
 }
 
 function swap32(n) {
-  return (((n >> 24) & 0xFF) << 0) |
-    (((n >> 16) & 0xFF) << 8) |
-    (((n >> 8) & 0xFF) << 16) |
-    (((n >> 0) & 0xFF) << 24);
+  return (
+    (((n >> 24) & 0xff) << 0) |
+    (((n >> 16) & 0xff) << 8) |
+    (((n >> 8) & 0xff) << 16) |
+    (((n >> 0) & 0xff) << 24)
+  );
 }
 
 function move_to_data(bis, offset) {
   bis.readBytes(18); // Move to compressed size
   var size = swap32(bis.read32());
   bis.readBytes(4);
   var file_len = swap16(bis.read16());
   var extra_len = swap16(bis.read16());
   bis.readBytes(file_len);
   bis.readBytes(extra_len);
   offset += ZIP_FILE_HEADER_SIZE + file_len + extra_len;
 
-  return {offset, size};
+  return { offset, size };
 }
 
 function test_alignment(align_size) {
   // Create zip for testing.
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
   for (var i = 0; i < TESTS.length; i++) {
     var source = do_get_file(DATA_DIR + TESTS[i].name);
     zipW.addEntryFile(TESTS[i].name, TESTS[i].compression, source, false);
   }
-  var stream = Cc["@mozilla.org/io/string-input-stream;1"]
-    .createInstance(Ci.nsIStringInputStream);
+  var stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
+    Ci.nsIStringInputStream
+  );
   stream.setData(DATA, DATA.length);
-  zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC,
-    Ci.nsIZipWriter.COMPRESSION_NONE, stream, false);
+  zipW.addEntryStream(
+    FILENAME,
+    time * PR_USEC_PER_MSEC,
+    Ci.nsIZipWriter.COMPRESSION_NONE,
+    stream,
+    false
+  );
   zipW.alignStoredFiles(align_size);
   zipW.close();
 
   // Check data can be decompressed.
   var zipR = new ZipReader(tmpFile);
-  stream = Cc["@mozilla.org/scriptableinputstream;1"]
-    .createInstance(Ci.nsIScriptableInputStream);
+  stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
   stream.init(zipR.getInputStream(FILENAME));
   var result = stream.read(DATA.length);
   Assert.equal(result, DATA);
   stream.close();
   zipR.close();
 
   // Check data is correct and aligned.
-  var fis = Cc["@mozilla.org/network/file-input-stream;1"]
-    .createInstance(Ci.nsIFileInputStream);
+  var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
   fis.init(tmpFile, -1, -1, null);
-  let bis = Cc["@mozilla.org/binaryinputstream;1"]
-    .createInstance(Ci.nsIBinaryInputStream);
+  let bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+    Ci.nsIBinaryInputStream
+  );
   bis.setInputStream(fis);
   var offset = 0;
 
   var ret = move_to_data(bis, offset); // "test.txt"
   offset = ret.offset;
   bis.readBytes(ret.size);
   offset += ret.size;
 
--- a/modules/libjar/zipwriter/test/unit/test_asyncadd.js
+++ b/modules/libjar/zipwriter/test/unit/test_asyncadd.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 // Values taken from using zipinfo to list the test.zip contents
 var TESTS = [
   {
     name: "test.txt",
     size: 232,
     crc: 0x0373ac26,
   },
@@ -17,18 +17,17 @@ var TESTS = [
     size: 3402,
     crc: 0x504a5c30,
   },
 ];
 
 var size = 0;
 
 var observer = {
-  onStartRequest(request) {
-  },
+  onStartRequest(request) {},
 
   onStopRequest(request, status) {
     Assert.equal(status, Cr.NS_OK);
 
     zipW.close();
     size += ZIP_EOCDR_HEADER_SIZE;
 
     Assert.equal(size, tmpFile.fileSize);
@@ -41,60 +40,72 @@ var observer = {
       for (let method in methods) {
         var entryName = method + "/" + TESTS[i].name;
         Assert.ok(zipR.hasEntry(entryName));
 
         var entry = zipR.getEntry(entryName);
         Assert.equal(entry.realSize, TESTS[i].size);
         Assert.equal(entry.size, TESTS[i].size);
         Assert.equal(entry.CRC32, TESTS[i].crc);
-        Assert.equal(Math.floor(entry.lastModifiedTime / PR_USEC_PER_SEC),
-                     Math.floor(source.lastModifiedTime / PR_MSEC_PER_SEC));
+        Assert.equal(
+          Math.floor(entry.lastModifiedTime / PR_USEC_PER_SEC),
+          Math.floor(source.lastModifiedTime / PR_MSEC_PER_SEC)
+        );
 
         zipR.test(entryName);
       }
     }
 
     zipR.close();
     do_test_finished();
   },
 };
 
 var methods = {
   file: function method_file(entry, source) {
-    zipW.addEntryFile(entry, Ci.nsIZipWriter.COMPRESSION_NONE, source,
-                      true);
+    zipW.addEntryFile(entry, Ci.nsIZipWriter.COMPRESSION_NONE, source, true);
   },
   channel: function method_channel(entry, source) {
-    zipW.addEntryChannel(entry, source.lastModifiedTime * PR_MSEC_PER_SEC,
-                         Ci.nsIZipWriter.COMPRESSION_NONE,
-                         NetUtil.newChannel({
-                           uri: ioSvc.newFileURI(source),
-                           loadUsingSystemPrincipal: true,
-                         }), true);
+    zipW.addEntryChannel(
+      entry,
+      source.lastModifiedTime * PR_MSEC_PER_SEC,
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      NetUtil.newChannel({
+        uri: ioSvc.newFileURI(source),
+        loadUsingSystemPrincipal: true,
+      }),
+      true
+    );
   },
   stream: function method_stream(entry, source) {
-    zipW.addEntryStream(entry, source.lastModifiedTime * PR_MSEC_PER_SEC,
-                        Ci.nsIZipWriter.COMPRESSION_NONE,
-                        NetUtil.newChannel({
-                          uri: ioSvc.newFileURI(source),
-                          loadUsingSystemPrincipal: true,
-                        }).open(), true);
+    zipW.addEntryStream(
+      entry,
+      source.lastModifiedTime * PR_MSEC_PER_SEC,
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      NetUtil.newChannel({
+        uri: ioSvc.newFileURI(source),
+        loadUsingSystemPrincipal: true,
+      }).open(),
+      true
+    );
   },
 };
 
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   for (var i = 0; i < TESTS.length; i++) {
     var source = do_get_file(DATA_DIR + TESTS[i].name);
     for (let method in methods) {
       var entry = method + "/" + TESTS[i].name;
       methods[method](entry, source);
-      size += ZIP_FILE_HEADER_SIZE + ZIP_CDS_HEADER_SIZE +
-              (ZIP_EXTENDED_TIMESTAMP_SIZE * 2) +
-              (entry.length * 2) + TESTS[i].size;
+      size +=
+        ZIP_FILE_HEADER_SIZE +
+        ZIP_CDS_HEADER_SIZE +
+        ZIP_EXTENDED_TIMESTAMP_SIZE * 2 +
+        entry.length * 2 +
+        TESTS[i].size;
     }
   }
   do_test_pending();
   zipW.processQueue(observer, null);
   Assert.ok(zipW.inQueue);
 }
--- a/modules/libjar/zipwriter/test/unit/test_asyncbadadd.js
+++ b/modules/libjar/zipwriter/test/unit/test_asyncbadadd.js
@@ -1,18 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 const FILENAME = "missing.txt";
 
 var observer = {
-  onStartRequest(request) {
-  },
+  onStartRequest(request) {},
 
   onStopRequest(request, status) {
     Assert.equal(status, Cr.NS_ERROR_FILE_NOT_FOUND);
     zipW.close();
     Assert.equal(ZIP_EOCDR_HEADER_SIZE, tmpFile.fileSize);
     do_test_finished();
   },
 };
--- a/modules/libjar/zipwriter/test/unit/test_asyncbadremove.js
+++ b/modules/libjar/zipwriter/test/unit/test_asyncbadremove.js
@@ -1,18 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 const FILENAME = "missing.txt";
 
 var observer = {
-  onStartRequest(request) {
-  },
+  onStartRequest(request) {},
 
   onStopRequest(request, status) {
     Assert.equal(status, Cr.NS_ERROR_FILE_NOT_FOUND);
     zipW.close();
     Assert.equal(ZIP_EOCDR_HEADER_SIZE, tmpFile.fileSize);
     do_test_finished();
   },
 };
--- a/modules/libjar/zipwriter/test/unit/test_asyncremove.js
+++ b/modules/libjar/zipwriter/test/unit/test_asyncremove.js
@@ -1,21 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
-var TESTS = [
-  "test.txt",
-  "test.png",
-];
+var TESTS = ["test.txt", "test.png"];
 
 var observer = {
-  onStartRequest(request) {
-  },
+  onStartRequest(request) {},
 
   onStopRequest(request, status) {
     Assert.equal(status, Cr.NS_OK);
 
     zipW.close();
 
     // Empty zip file should just be the end of central directory marker
     var newTmpFile = tmpFile.clone();
--- a/modules/libjar/zipwriter/test/unit/test_bug399727.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug399727.js
@@ -1,82 +1,107 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 function BinaryComparer(file, callback) {
-  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
-                createInstance(Ci.nsIFileInputStream);
+  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
   fstream.init(file, -1, 0, 0);
   this.length = file.fileSize;
-  this.fileStream = Cc["@mozilla.org/binaryinputstream;1"].
-                    createInstance(Ci.nsIBinaryInputStream);
+  this.fileStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+    Ci.nsIBinaryInputStream
+  );
   this.fileStream.setInputStream(fstream);
   this.offset = 0;
   this.callback = callback;
 }
 
 BinaryComparer.prototype = {
   fileStream: null,
   offset: null,
   length: null,
   callback: null,
 
-  onStartRequest(aRequest) {
-  },
+  onStartRequest(aRequest) {},
 
   onStopRequest(aRequest, aStatusCode) {
     this.fileStream.close();
     Assert.equal(aStatusCode, Cr.NS_OK);
     Assert.equal(this.offset, this.length);
     this.callback();
   },
 
   onDataAvailable(aRequest, aInputStream, aOffset, aCount) {
-    var stream = Cc["@mozilla.org/binaryinputstream;1"].
-                 createInstance(Ci.nsIBinaryInputStream);
+    var stream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+      Ci.nsIBinaryInputStream
+    );
     stream.setInputStream(aInputStream);
     var source, actual;
     for (var i = 0; i < aCount; i++) {
       try {
         source = this.fileStream.read8();
       } catch (e) {
         do_throw("Unable to read from file at offset " + this.offset + " " + e);
       }
       try {
         actual = stream.read8();
       } catch (e) {
-        do_throw("Unable to read from converted stream at offset " + this.offset + " " + e);
+        do_throw(
+          "Unable to read from converted stream at offset " +
+            this.offset +
+            " " +
+            e
+        );
       }
-      if (source != actual)
-        do_throw("Invalid value " + actual + " at offset " + this.offset + ", should have been " + source);
+      if (source != actual) {
+        do_throw(
+          "Invalid value " +
+            actual +
+            " at offset " +
+            this.offset +
+            ", should have been " +
+            source
+        );
+      }
       this.offset++;
     }
   },
 };
 
 function comparer_callback() {
   do_test_finished();
 }
 
 function run_test() {
   var source = do_get_file(DATA_DIR + "test_bug399727.html");
-  var comparer = new BinaryComparer(do_get_file(DATA_DIR + "test_bug399727.zlib"),
-                                    comparer_callback);
+  var comparer = new BinaryComparer(
+    do_get_file(DATA_DIR + "test_bug399727.zlib"),
+    comparer_callback
+  );
 
   // Prepare the stream converter
-  var scs = Cc["@mozilla.org/streamConverters;1"].
-            getService(Ci.nsIStreamConverterService);
-  var converter = scs.asyncConvertData("uncompressed", "deflate", comparer, null);
+  var scs = Cc["@mozilla.org/streamConverters;1"].getService(
+    Ci.nsIStreamConverterService
+  );
+  var converter = scs.asyncConvertData(
+    "uncompressed",
+    "deflate",
+    comparer,
+    null
+  );
 
   // Open the expected output file
-  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
-                createInstance(Ci.nsIFileInputStream);
+  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
   fstream.init(source, -1, 0, 0);
 
   // Set up a pump to push data from the file to the stream converter
-  var pump = Cc["@mozilla.org/network/input-stream-pump;1"].
-             createInstance(Ci.nsIInputStreamPump);
+  var pump = Cc["@mozilla.org/network/input-stream-pump;1"].createInstance(
+    Ci.nsIInputStreamPump
+  );
   pump.init(fstream, 0, 0, true);
   pump.asyncRead(converter, null);
   do_test_pending();
 }
--- a/modules/libjar/zipwriter/test/unit/test_bug419769_1.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug419769_1.js
@@ -33,36 +33,43 @@ function testpass(source) {
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   // Shouldn't be there to start with.
   Assert.ok(!zipW.hasEntry(FILENAME));
 
   Assert.ok(!zipW.inQueue);
 
-  var stream = Cc["@mozilla.org/io/string-input-stream;1"]
-    .createInstance(Ci.nsIStringInputStream);
+  var stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
+    Ci.nsIStringInputStream
+  );
   stream.setData(DATA, DATA.length);
-  zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC,
-    Ci.nsIZipWriter.COMPRESSION_BEST, stream, false);
+  zipW.addEntryStream(
+    FILENAME,
+    time * PR_USEC_PER_MSEC,
+    Ci.nsIZipWriter.COMPRESSION_BEST,
+    stream,
+    false
+  );
 
   // Check that zip state is right at this stage.
   testpass(zipW);
   zipW.close();
 
   // Check to see if we get the same results loading afresh.
   zipW.open(tmpFile, PR_RDWR);
   testpass(zipW);
   zipW.close();
 
   // Test the stored data with the zipreader
   var zipR = new ZipReader(tmpFile);
   testpass(zipR);
   zipR.test(FILENAME);
-  stream = Cc["@mozilla.org/scriptableinputstream;1"]
-    .createInstance(Ci.nsIScriptableInputStream);
+  stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
   stream.init(zipR.getInputStream(FILENAME));
   var result = stream.read(DATA.length);
   stream.close();
   zipR.close();
 
   Assert.equal(result, DATA);
 }
--- a/modules/libjar/zipwriter/test/unit/test_bug419769_2.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug419769_2.js
@@ -46,17 +46,18 @@ function run_test() {
   zipW.open(tmpFile, PR_RDWR);
   testpass(zipW);
   zipW.close();
 
   // Test the stored data with the zipreader
   var zipR = new ZipReader(tmpFile);
   testpass(zipR);
   zipR.test(FILENAME);
-  var stream = Cc["@mozilla.org/scriptableinputstream;1"]
-                .createInstance(Ci.nsIScriptableInputStream);
+  var stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
   stream.init(zipR.getInputStream(FILENAME));
   var result = stream.read(DATA.length);
   stream.close();
   zipR.close();
 
   Assert.equal(result, DATA);
 }
--- a/modules/libjar/zipwriter/test/unit/test_bug425768.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug425768.js
@@ -18,13 +18,16 @@ function run_test() {
   zipW.close();
 
   var zipR = new ZipReader(tmpFile);
   Assert.ok(zipR.hasEntry(DIRNAME));
   zipR.close();
 
   // Adding the directory would have added a fixed amount to the file size.
   // Any difference suggests the CDS was written out incorrectly.
-  var extra = ZIP_FILE_HEADER_SIZE + ZIP_CDS_HEADER_SIZE +
-              (DIRNAME.length * 2) + (ZIP_EXTENDED_TIMESTAMP_SIZE * 2);
+  var extra =
+    ZIP_FILE_HEADER_SIZE +
+    ZIP_CDS_HEADER_SIZE +
+    DIRNAME.length * 2 +
+    ZIP_EXTENDED_TIMESTAMP_SIZE * 2;
 
   Assert.equal(source.fileSize + extra, tmpFile.fileSize);
 }
--- a/modules/libjar/zipwriter/test/unit/test_bug433248.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug433248.js
@@ -29,17 +29,22 @@ function run_test() {
   try {
     zipW.addEntryDirectory("test", 0, false);
     do_throw("Should have thrown uninitialized error.");
   } catch (e) {
     Assert.equal(e.result, Cr.NS_ERROR_NOT_INITIALIZED);
   }
 
   try {
-    zipW.addEntryFile("test", Ci.nsIZipWriter.COMPRESSION_DEFAULT, tmpDir, false);
+    zipW.addEntryFile(
+      "test",
+      Ci.nsIZipWriter.COMPRESSION_DEFAULT,
+      tmpDir,
+      false
+    );
     do_throw("Should have thrown uninitialized error.");
   } catch (e) {
     Assert.equal(e.result, Cr.NS_ERROR_NOT_INITIALIZED);
   }
 
   try {
     zipW.removeEntry("test", false);
     do_throw("Should have thrown uninitialized error.");
--- a/modules/libjar/zipwriter/test/unit/test_bug446708.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug446708.js
@@ -8,17 +8,22 @@ function run_test() {
 function AddToZip(zipWriter, path, file) {
   var currentPath = path + file.leafName;
 
   if (file.isDirectory()) {
     currentPath += "/";
   }
 
   // THIS IS WHERE THE ERROR OCCURS, FOR THE FILE "st14-1.tiff" IN "test_bug446708"
-  zipWriter.addEntryFile(currentPath, Ci.nsIZipWriter.COMPRESSION_DEFAULT, file, false);
+  zipWriter.addEntryFile(
+    currentPath,
+    Ci.nsIZipWriter.COMPRESSION_DEFAULT,
+    file,
+    false
+  );
 
   // if it's a dir, continue adding its contents recursively...
   if (file.isDirectory()) {
     var entries = file.QueryInterface(Ci.nsIFile).directoryEntries;
     while (entries.hasMoreElements()) {
       var entry = entries.nextFile;
       AddToZip(zipWriter, currentPath, entry);
     }
@@ -27,9 +32,8 @@ function AddToZip(zipWriter, path, file)
   // ...otherwise, we're done
 }
 
 function RecursivelyZipDirectory(bundle) {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
   AddToZip(zipW, "", bundle);
   zipW.close();
 }
-
--- a/modules/libjar/zipwriter/test/unit/test_bug467740.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug467740.js
@@ -13,19 +13,23 @@ function run_test() {
 
   invalidArchives.forEach(function(invalidArchive) {
     // Get a reference to the invalid file
     var invalidFile = do_get_file(DATA_DIR + invalidArchive);
 
     // Opening the invalid file should fail (but not crash)
     try {
       zipW.open(invalidFile, PR_RDWR);
-      do_throw("Should have thrown NS_ERROR_FILE_CORRUPTED on " +
-               invalidArchive + " !");
+      do_throw(
+        "Should have thrown NS_ERROR_FILE_CORRUPTED on " + invalidArchive + " !"
+      );
     } catch (e) {
-      if (!(e instanceof Ci.nsIException &&
-            e.result == Cr.NS_ERROR_FILE_CORRUPTED)) {
+      if (
+        !(
+          e instanceof Ci.nsIException && e.result == Cr.NS_ERROR_FILE_CORRUPTED
+        )
+      ) {
         throw e;
       }
       // do nothing
     }
   });
 }
--- a/modules/libjar/zipwriter/test/unit/test_bug717061.js
+++ b/modules/libjar/zipwriter/test/unit/test_bug717061.js
@@ -1,89 +1,106 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0
  */
 
 function BinaryComparer(file, callback) {
-  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
-    createInstance(Ci.nsIFileInputStream);
+  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
   fstream.init(file, -1, 0, 0);
   this.length = file.fileSize;
-  this.fileStream = Cc["@mozilla.org/binaryinputstream;1"].
-    createInstance(Ci.nsIBinaryInputStream);
+  this.fileStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+    Ci.nsIBinaryInputStream
+  );
   this.fileStream.setInputStream(fstream);
   this.offset = 0;
   this.callback = callback;
 }
 
 BinaryComparer.prototype = {
   fileStream: null,
   offset: null,
   length: null,
   callback: null,
 
-  onStartRequest(aRequest) {
-  },
+  onStartRequest(aRequest) {},
 
   onStopRequest(aRequest, aStatusCode) {
     this.fileStream.close();
     Assert.equal(aStatusCode, Cr.NS_OK);
     Assert.equal(this.offset, this.length);
     this.callback();
   },
 
   onDataAvailable(aRequest, aInputStream, aOffset, aCount) {
-    var stream = Cc["@mozilla.org/binaryinputstream;1"].
-      createInstance(Ci.nsIBinaryInputStream);
+    var stream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+      Ci.nsIBinaryInputStream
+    );
     stream.setInputStream(aInputStream);
     var source, actual;
     for (var i = 0; i < aCount; i++) {
       try {
         source = this.fileStream.read8();
       } catch (e) {
         do_throw("Unable to read from file at offset " + this.offset + " " + e);
       }
       try {
         actual = stream.read8();
       } catch (e) {
-        do_throw("Unable to read from converted stream at offset " +
-          this.offset + " " + e);
+        do_throw(
+          "Unable to read from converted stream at offset " +
+            this.offset +
+            " " +
+            e
+        );
       }
       // The byte at offset 9 is the OS byte (see RFC 1952, section 2.3), which
       // can legitimately differ when the source is compressed on different
       // operating systems.  The actual .gz for this test was created on a Unix
       // system, but we want the test to work correctly everywhere.  So ignore
       // the byte at offset 9.
       if (this.offset != 9 && source != actual) {
-        do_throw("Invalid value " + actual + " at offset " +
-          this.offset + ", should have been " + source);
+        do_throw(
+          "Invalid value " +
+            actual +
+            " at offset " +
+            this.offset +
+            ", should have been " +
+            source
+        );
       }
       this.offset++;
     }
   },
 };
 
 function comparer_callback() {
   do_test_finished();
 }
 
 function run_test() {
   var source = do_get_file(DATA_DIR + "test_bug717061.html");
-  var comparer = new BinaryComparer(do_get_file(DATA_DIR + "test_bug717061.gz"),
-    comparer_callback);
+  var comparer = new BinaryComparer(
+    do_get_file(DATA_DIR + "test_bug717061.gz"),
+    comparer_callback
+  );
 
   // Prepare the stream converter
-  var scs = Cc["@mozilla.org/streamConverters;1"].
-    getService(Ci.nsIStreamConverterService);
+  var scs = Cc["@mozilla.org/streamConverters;1"].getService(
+    Ci.nsIStreamConverterService
+  );
   var converter = scs.asyncConvertData("uncompressed", "gzip", comparer, null);
 
   // Open the expected output file
-  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
-    createInstance(Ci.nsIFileInputStream);
+  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
+    Ci.nsIFileInputStream
+  );
   fstream.init(source, -1, 0, 0);
 
   // Set up a pump to push data from the file to the stream converter
-  var pump = Cc["@mozilla.org/network/input-stream-pump;1"].
-    createInstance(Ci.nsIInputStreamPump);
+  var pump = Cc["@mozilla.org/network/input-stream-pump;1"].createInstance(
+    Ci.nsIInputStreamPump
+  );
   pump.init(fstream, 0, 0, true);
   pump.asyncRead(converter, null);
   do_test_pending();
 }
--- a/modules/libjar/zipwriter/test/unit/test_deflatedata.js
+++ b/modules/libjar/zipwriter/test/unit/test_deflatedata.js
@@ -12,21 +12,27 @@ const time = 1199145600000; // Jan 1st 2
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   // Shouldn't be there to start with.
   Assert.ok(!zipW.hasEntry(FILENAME));
 
   Assert.ok(!zipW.inQueue);
 
-  var stream = Cc["@mozilla.org/io/string-input-stream;1"]
-                .createInstance(Ci.nsIStringInputStream);
+  var stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
+    Ci.nsIStringInputStream
+  );
   stream.setData(DATA, DATA.length);
-  zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC,
-                      Ci.nsIZipWriter.COMPRESSION_BEST, stream, false);
+  zipW.addEntryStream(
+    FILENAME,
+    time * PR_USEC_PER_MSEC,
+    Ci.nsIZipWriter.COMPRESSION_BEST,
+    stream,
+    false
+  );
 
   var entry = zipW.getEntry(FILENAME);
 
   Assert.ok(entry != null);
 
   // Check entry seems right.
   Assert.equal(entry.compression, ZIP_METHOD_DEFLATE);
   Assert.equal(entry.CRC32, CRC);
@@ -36,17 +42,18 @@ function run_test() {
   zipW.close();
 
   // Test the stored data with the zipreader
   var zipR = new ZipReader(tmpFile);
   Assert.ok(zipR.hasEntry(FILENAME));
 
   zipR.test(FILENAME);
 
-  stream = Cc["@mozilla.org/scriptableinputstream;1"]
-                .createInstance(Ci.nsIScriptableInputStream);
+  stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
   stream.init(zipR.getInputStream(FILENAME));
   var result = stream.read(DATA.length);
   stream.close();
   zipR.close();
 
   Assert.equal(result, DATA);
 }
--- a/modules/libjar/zipwriter/test/unit/test_storedata.js
+++ b/modules/libjar/zipwriter/test/unit/test_storedata.js
@@ -36,41 +36,53 @@ function testpass(source) {
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   // Shouldn't be there to start with.
   Assert.ok(!zipW.hasEntry(FILENAME));
 
   Assert.ok(!zipW.inQueue);
 
-  var stream = Cc["@mozilla.org/io/string-input-stream;1"]
-                .createInstance(Ci.nsIStringInputStream);
+  var stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
+    Ci.nsIStringInputStream
+  );
   stream.setData(DATA, DATA.length);
-  zipW.addEntryStream(FILENAME, time * PR_USEC_PER_MSEC,
-                      Ci.nsIZipWriter.COMPRESSION_NONE, stream, false);
+  zipW.addEntryStream(
+    FILENAME,
+    time * PR_USEC_PER_MSEC,
+    Ci.nsIZipWriter.COMPRESSION_NONE,
+    stream,
+    false
+  );
 
   // Check that zip state is right at this stage.
   testpass(zipW);
   zipW.close();
 
-  Assert.equal(tmpFile.fileSize,
-               DATA.length + ZIP_FILE_HEADER_SIZE + ZIP_CDS_HEADER_SIZE +
-               (ZIP_EXTENDED_TIMESTAMP_SIZE * 2) +
-               (FILENAME.length * 2) + ZIP_EOCDR_HEADER_SIZE);
+  Assert.equal(
+    tmpFile.fileSize,
+    DATA.length +
+      ZIP_FILE_HEADER_SIZE +
+      ZIP_CDS_HEADER_SIZE +
+      ZIP_EXTENDED_TIMESTAMP_SIZE * 2 +
+      FILENAME.length * 2 +
+      ZIP_EOCDR_HEADER_SIZE
+  );
 
   // Check to see if we get the same results loading afresh.
   zipW.open(tmpFile, PR_RDWR);
   testpass(zipW);
   zipW.close();
 
   // Test the stored data with the zipreader
   var zipR = new ZipReader(tmpFile);
   testpass(zipR);
   zipR.test(FILENAME);
-  stream = Cc["@mozilla.org/scriptableinputstream;1"]
-                .createInstance(Ci.nsIScriptableInputStream);
+  stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
   stream.init(zipR.getInputStream(FILENAME));
   var result = stream.read(DATA.length);
   stream.close();
   zipR.close();
 
   Assert.equal(result, DATA);
 }
--- a/modules/libjar/zipwriter/test/unit/test_sync.js
+++ b/modules/libjar/zipwriter/test/unit/test_sync.js
@@ -18,21 +18,28 @@ var TESTS = [
 ];
 
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   var size = 0;
   for (let i = 0; i < TESTS.length; i++) {
     let source = do_get_file(DATA_DIR + TESTS[i].name);
-    zipW.addEntryFile(TESTS[i].name, Ci.nsIZipWriter.COMPRESSION_NONE, source,
-                      false);
-    size += ZIP_FILE_HEADER_SIZE + ZIP_CDS_HEADER_SIZE +
-            (ZIP_EXTENDED_TIMESTAMP_SIZE * 2) +
-            (TESTS[i].name.length * 2) + TESTS[i].size;
+    zipW.addEntryFile(
+      TESTS[i].name,
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      source,
+      false
+    );
+    size +=
+      ZIP_FILE_HEADER_SIZE +
+      ZIP_CDS_HEADER_SIZE +
+      ZIP_EXTENDED_TIMESTAMP_SIZE * 2 +
+      TESTS[i].name.length * 2 +
+      TESTS[i].size;
   }
 
   zipW.close();
   size += ZIP_EOCDR_HEADER_SIZE;
 
   Assert.equal(size, tmpFile.fileSize);
 
   // Test the stored data with the zipreader
@@ -41,16 +48,18 @@ function run_test() {
   for (let i = 0; i < TESTS.length; i++) {
     let source = do_get_file(DATA_DIR + TESTS[i].name);
     Assert.ok(zipR.hasEntry(TESTS[i].name));
 
     var entry = zipR.getEntry(TESTS[i].name);
     Assert.equal(entry.realSize, TESTS[i].size);
     Assert.equal(entry.size, TESTS[i].size);
     Assert.equal(entry.CRC32, TESTS[i].crc);
-    Assert.equal(Math.floor(entry.lastModifiedTime / PR_USEC_PER_SEC),
-                 Math.floor(source.lastModifiedTime / PR_MSEC_PER_SEC));
+    Assert.equal(
+      Math.floor(entry.lastModifiedTime / PR_USEC_PER_SEC),
+      Math.floor(source.lastModifiedTime / PR_MSEC_PER_SEC)
+    );
 
     zipR.test(TESTS[i].name);
   }
 
   zipR.close();
 }
--- a/modules/libjar/zipwriter/test/unit/test_undochange.js
+++ b/modules/libjar/zipwriter/test/unit/test_undochange.js
@@ -1,32 +1,37 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 // Values taken from using zipinfo to list the test.zip contents
-var TESTS = [
-  "test.txt",
-  "test.png",
-];
+var TESTS = ["test.txt", "test.png"];
 
 function run_test() {
   zipW.open(tmpFile, PR_RDWR | PR_CREATE_FILE | PR_TRUNCATE);
 
   for (let i = 0; i < TESTS.length; i++) {
     let source = do_get_file(DATA_DIR + TESTS[i]);
-    zipW.addEntryFile(TESTS[i], Ci.nsIZipWriter.COMPRESSION_NONE, source,
-                      false);
+    zipW.addEntryFile(
+      TESTS[i],
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      source,
+      false
+    );
   }
 
   try {
     let source = do_get_file(DATA_DIR + TESTS[0]);
-    zipW.addEntryFile(TESTS[0], Ci.nsIZipWriter.COMPRESSION_NONE, source,
-                      false);
+    zipW.addEntryFile(
+      TESTS[0],
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      source,
+      false
+    );
     do_throw("Should not be able to add the same file twice");
   } catch (e) {
     Assert.equal(e.result, Cr.NS_ERROR_FILE_ALREADY_EXISTS);
   }
 
   // Remove all the tests and see if we are left with an empty zip
   for (let i = 0; i < TESTS.length; i++) {
     zipW.removeEntry(TESTS[i], false);
--- a/modules/libjar/zipwriter/test/unit/test_zippermissions.js
+++ b/modules/libjar/zipwriter/test/unit/test_zippermissions.js
@@ -22,18 +22,19 @@ function build_tests() {
       }
     }
   }
 }
 
 function run_test() {
   build_tests();
 
-  var foStream = Cc["@mozilla.org/network/file-output-stream;1"].
-                 createInstance(Ci.nsIFileOutputStream);
+  var foStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(
+    Ci.nsIFileOutputStream
+  );
 
   var tmp = tmpDir.clone();
   tmp.append("temp-permissions");
   tmp.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
 
   var file = tmp.clone();
   file.append("tempfile");
 
@@ -43,38 +44,58 @@ function run_test() {
     // This obeys the umask
     foStream.init(file, 0x02 | 0x08 | 0x20, TESTS[i].permission, 0);
     foStream.close();
 
     // umask may have altered the permissions so test against what they really were.
     // This reduces the coverage of the test but there isn't much we can do
     var perm = file.permissions & 0xfff;
     if (TESTS[i].permission != perm) {
-      dump("File permissions for " + TESTS[i].name + " were " + perm.toString(8) + "\n");
+      dump(
+        "File permissions for " +
+          TESTS[i].name +
+          " were " +
+          perm.toString(8) +
+          "\n"
+      );
       TESTS[i].permission = perm;
     }
 
-    zipW.addEntryFile(TESTS[i].name, Ci.nsIZipWriter.COMPRESSION_NONE, file, false);
-    Assert.equal(zipW.getEntry(TESTS[i].name).permissions, TESTS[i].permission | 0o400);
+    zipW.addEntryFile(
+      TESTS[i].name,
+      Ci.nsIZipWriter.COMPRESSION_NONE,
+      file,
+      false
+    );
+    Assert.equal(
+      zipW.getEntry(TESTS[i].name).permissions,
+      TESTS[i].permission | 0o400
+    );
     file.permissions = 0o600;
     file.remove(true);
   }
   zipW.close();
 
   zipW.open(tmpFile, PR_RDWR);
   for (let i = 0; i < TESTS.length; i++) {
     dump("Testing zipwriter file permissions for " + TESTS[i].name + "\n");
-    Assert.equal(zipW.getEntry(TESTS[i].name).permissions, TESTS[i].permission | 0o400);
+    Assert.equal(
+      zipW.getEntry(TESTS[i].name).permissions,
+      TESTS[i].permission | 0o400
+    );
   }
   zipW.close();
 
   var zipR = new ZipReader(tmpFile);
   for (let i = 0; i < TESTS.length; i++) {
     dump("Testing zipreader file permissions for " + TESTS[i].name + "\n");
-    Assert.equal(zipR.getEntry(TESTS[i].name).permissions, TESTS[i].permission | 0o400);
+    Assert.equal(
+      zipR.getEntry(TESTS[i].name).permissions,
+      TESTS[i].permission | 0o400
+    );
     dump("Testing extracted file permissions for " + TESTS[i].name + "\n");
     zipR.extract(TESTS[i].name, file);
     Assert.equal(file.permissions & 0xfff, TESTS[i].permission);
     Assert.ok(!file.isDirectory());
     file.permissions = 0o600;
     file.remove(true);
   }
   zipR.close();
--- a/modules/libmar/tests/unit/head_libmar.js
+++ b/modules/libmar/tests/unit/head_libmar.js
@@ -26,24 +26,26 @@ function compareBinaryData(arr1, arr2) {
 
 /**
  * Reads a file's data and returns it
  *
  * @param file The file to read the data from
  * @return a byte array for the data in the file.
  */
 function getBinaryFileData(file) {
-  let fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
-                   createInstance(Ci.nsIFileInputStream);
+  let fileStream = Cc[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Ci.nsIFileInputStream);
   // Open as RD_ONLY with default permissions.
   fileStream.init(file, -1, -1, null);
 
   // Check the returned size versus the expected size.
-  let stream = Cc["@mozilla.org/binaryinputstream;1"].
-               createInstance(Ci.nsIBinaryInputStream);
+  let stream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+    Ci.nsIBinaryInputStream
+  );
   stream.setInputStream(fileStream);
   let bytes = stream.readByteArray(stream.available());
   fileStream.close();
   return bytes;
 }
 
 /**
  * Runs each method in the passed in object
@@ -62,19 +64,21 @@ function run_tests(obj) {
   registerCleanupFunction(cleanup_per_test);
 
   // Make sure there's nothing left over from a preious failed test
   cleanup_per_test();
 
   let ranCount = 0;
   // hasOwnProperty ensures we only see direct properties and not all
   for (let f in obj) {
-    if (typeof obj[f] === "function" &&
-        obj.hasOwnProperty(f) &&
-        f.toString().indexOf("test_") === 0) {
+    if (
+      typeof obj[f] === "function" &&
+      obj.hasOwnProperty(f) &&
+      f.toString().indexOf("test_") === 0
+    ) {
       obj[f]();
       cleanup_per_test();
       ranCount++;
     }
   }
   return ranCount;
 }
 
@@ -85,18 +89,17 @@ function run_tests(obj) {
  * @param dataDir The directory where the relative file paths exist
  * @param files   The relative file paths of the files to include in the MAR
  */
 function createMAR(outMAR, dataDir, files) {
   // You cannot create an empy MAR.
   Assert.ok(files.length > 0);
 
   // Get an nsIProcess to the signmar binary.
-  let process = Cc["@mozilla.org/process/util;1"].
-                createInstance(Ci.nsIProcess);
+  let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
   let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
   // Make sure the signmar binary exists and is an executable.
   Assert.ok(signmarBin.exists());
   Assert.ok(signmarBin.isExecutable());
 
   // Ensure on non Windows platforms we encode the same permissions
   // as the refernence MARs contain.  On Windows this is also safe.
@@ -105,18 +108,26 @@ function createMAR(outMAR, dataDir, file
   // (perhaps 0o777), make sure that we encode them as 0o664.
   for (let filePath of files) {
     let f = dataDir.clone();
     f.append(filePath);
     f.permissions = 0o664;
   }
 
   // Setup the command line arguments to create the MAR.
-  let args = ["-C", dataDir.path, "-H", "\@MAR_CHANNEL_ID\@",
-              "-V", "13.0a1", "-c", outMAR.path];
+  let args = [
+    "-C",
+    dataDir.path,
+    "-H",
+    "@MAR_CHANNEL_ID@",
+    "-V",
+    "13.0a1",
+    "-c",
+    outMAR.path,
+  ];
   args = args.concat(files);
 
   info("Running: " + signmarBin.path + " " + args.join(" "));
   process.init(signmarBin);
   process.run(true, args, args.length);
 
   // Verify signmar returned 0 for success.
   Assert.equal(process.exitValue, 0);
@@ -128,18 +139,17 @@ function createMAR(outMAR, dataDir, file
 /**
  * Extracts a MAR file to the specified output directory.
  *
  * @param mar     The MAR file that should be matched
  * @param dataDir The directory to extract to
  */
 function extractMAR(mar, dataDir) {
   // Get an nsIProcess to the signmar binary.
-  let process = Cc["@mozilla.org/process/util;1"].
-                createInstance(Ci.nsIProcess);
+  let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
   let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
   // Make sure the signmar binary exists and is an executable.
   Assert.ok(signmarBin.exists());
   Assert.ok(signmarBin.isExecutable());
 
   // Setup the command line arguments to extract the MAR.
   let args = ["-C", dataDir.path, "-x", mar.path];
--- a/modules/libmar/tests/unit/test_create.js
+++ b/modules/libmar/tests/unit/test_create.js
@@ -78,18 +78,21 @@ function run_test() {
       return run_one_test("1_byte.mar", ["1_byte_file"]);
     },
     // Test creating a MAR file with binary data.
     test_binary_data: function _test_binary_data() {
       return run_one_test("binary_data.mar", ["binary_data_file"]);
     },
     // Test creating a MAR file with multiple files inside of it.
     test_multiple_file: function _test_multiple_file() {
-      return run_one_test("multiple_file.mar",
-                          ["0_sized_file", "1_byte_file", "binary_data_file"]);
+      return run_one_test("multiple_file.mar", [
+        "0_sized_file",
+        "1_byte_file",
+        "binary_data_file",
+      ]);
     },
     // Test creating a MAR file on top of a different one that already exists
     // at the location the new one will be created at.
     test_overwrite_already_exists: function _test_overwrite_already_exists() {
       let differentFile = do_get_file("data/1_byte.mar");
       let outMARDir = tempDir.clone();
       differentFile.copyTo(outMARDir, "out.mar");
       return run_one_test("binary_data.mar", ["binary_data_file"], false);
--- a/modules/libmar/tests/unit/test_extract.js
+++ b/modules/libmar/tests/unit/test_extract.js
@@ -88,18 +88,21 @@ function run_test() {
     },
     // Test extracting a MAR with a product information block (PIB) that is
     // signed and which contains binary data.
     test_pib_signed: function _test_pib_signed() {
       return extract_and_compare("signed_pib.mar", ["binary_data_file"]);
     },
     // Test extracting a MAR file with multiple files inside of it.
     test_multiple_file: function _test_multiple_file() {
-      return extract_and_compare("multiple_file.mar",
-                          ["0_sized_file", "1_byte_file", "binary_data_file"]);
+      return extract_and_compare("multiple_file.mar", [
+        "0_sized_file",
+        "1_byte_file",
+        "binary_data_file",
+      ]);
     },
     // Test collision detection where file A + B are the same offset
     test_collision_same_offset: function test_collision_same_offset() {
       return extract_and_fail("manipulated_same_offset.mar");
     },
     // Test collision detection where file A's indexes are a subset of file B's
     test_collision_is_contained: function test_collision_is_contained() {
       return extract_and_fail("manipulated_is_container.mar");
--- a/modules/libmar/tests/unit/test_sign_verify.js
+++ b/modules/libmar/tests/unit/test_sign_verify.js
@@ -5,18 +5,19 @@ function run_test() {
   /**
    * Signs a MAR file.
    *
    * @param inMAR The MAR file that should be signed
    * @param outMAR The MAR file to create
    */
   function signMAR(inMAR, outMAR, certs, wantSuccess, useShortHandCmdLine) {
     // Get a process to the signmar binary from the dist/bin directory.
-    let process = Cc["@mozilla.org/process/util;1"].
-                  createInstance(Ci.nsIProcess);
+    let process = Cc["@mozilla.org/process/util;1"].createInstance(
+      Ci.nsIProcess
+    );
     let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
     // Make sure the signmar binary exists and is an executable.
     Assert.ok(signmarBin.exists());
     Assert.ok(signmarBin.isExecutable());
 
     // Setup the command line arguments to sign the MAR.
     let NSSConfigDir = do_get_file("data");
@@ -53,18 +54,19 @@ function run_test() {
    *
    * @param inMAR        The MAR file who's signature should be extracted
    * @param sigIndex     The index of the signature to extract
    * @param extractedSig The file where the extracted signature will be stored
    * @param wantSuccess  True if a successful signmar return code is desired
    */
   function extractMARSignature(inMAR, sigIndex, extractedSig, wantSuccess) {
     // Get a process to the signmar binary from the dist/bin directory.
-    let process = Cc["@mozilla.org/process/util;1"].
-                  createInstance(Ci.nsIProcess);
+    let process = Cc["@mozilla.org/process/util;1"].createInstance(
+      Ci.nsIProcess
+    );
     let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
     // Make sure the signmar binary exists and is an executable.
     Assert.ok(signmarBin.exists());
     Assert.ok(signmarBin.isExecutable());
 
     // Setup the command line arguments to extract the signature in the MAR.
     let args = ["-n" + sigIndex, "-X", inMAR.path, extractedSig.path];
@@ -94,18 +96,19 @@ function run_test() {
    * @param sigIndex     The index of the signature to import to
    * @param sigFile      The file where the base64 signature exists
    * @param outMAR       The same as inMAR but with the specified signature
    *                     swapped at the specified index.
    * @param wantSuccess  True if a successful signmar return code is desired
    */
   function importMARSignature(inMAR, sigIndex, sigFile, outMAR, wantSuccess) {
     // Get a process to the signmar binary from the dist/bin directory.
-    let process = Cc["@mozilla.org/process/util;1"].
-                  createInstance(Ci.nsIProcess);
+    let process = Cc["@mozilla.org/process/util;1"].createInstance(
+      Ci.nsIProcess
+    );
     let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
     // Make sure the signmar binary exists and is an executable.
     Assert.ok(signmarBin.exists());
     Assert.ok(signmarBin.isExecutable());
 
     // Setup the command line arguments to import the signature in the MAR.
     let args = ["-n" + sigIndex, "-I", inMAR.path, sigFile.path, outMAR.path];
@@ -130,18 +133,19 @@ function run_test() {
 
   /**
    * Verifies a MAR file.
    *
    * @param signedMAR Verifies a MAR file
    */
   function verifyMAR(signedMAR, wantSuccess, certs, useShortHandCmdLine) {
     // Get a process to the signmar binary from the dist/bin directory.
-    let process = Cc["@mozilla.org/process/util;1"].
-                  createInstance(Ci.nsIProcess);
+    let process = Cc["@mozilla.org/process/util;1"].createInstance(
+      Ci.nsIProcess
+    );
     let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
     // Make sure the signmar binary exists and is an executable.
     Assert.ok(signmarBin.exists());
     Assert.ok(signmarBin.isExecutable());
 
     // Will reference the arguments to use for verification in signmar
     let args = [];
@@ -195,18 +199,19 @@ function run_test() {
   /**
    * Strips a MAR signature.
    *
    * @param signedMAR The MAR file that should be signed
    * @param outMAR The MAR file to write to with signature stripped
    */
   function stripMARSignature(signedMAR, outMAR, wantSuccess) {
     // Get a process to the signmar binary from the dist/bin directory.
-    let process = Cc["@mozilla.org/process/util;1"].
-                  createInstance(Ci.nsIProcess);
+    let process = Cc["@mozilla.org/process/util;1"].createInstance(
+      Ci.nsIProcess
+    );
     let signmarBin = do_get_file("signmar" + BIN_SUFFIX);
 
     // Make sure the signmar binary exists and is an executable.
     Assert.ok(signmarBin.exists());
     Assert.ok(signmarBin.isExecutable());
 
     // Setup the command line arguments to create the MAR.
     let args = ["-r", signedMAR.path, outMAR.path];
@@ -276,18 +281,23 @@ function run_test() {
     test_sign_multiple: function _test_sign_multiple() {
       let inMAR = do_get_file("data/binary_data.mar");
       let outMAR = tempDir.clone();
       outMAR.append("multiple_signed_out.mar");
       if (outMAR.exists()) {
         outMAR.remove(false);
       }
       Assert.ok(!outMAR.exists());
-      signMAR(inMAR, outMAR, ["mycert", "mycert2", "mycert3"],
-              wantSuccess, true);
+      signMAR(
+        inMAR,
+        outMAR,
+        ["mycert", "mycert2", "mycert3"],
+        wantSuccess,
+        true
+      );
       Assert.ok(outMAR.exists());
       let outMARData = getBinaryFileData(outMAR);
       let refMAR = do_get_file("data/multiple_signed_pib.mar");
       let refMARData = getBinaryFileData(refMAR);
       compareBinaryData(outMARData, refMARData);
     },
     // Test verifying a signed MAR file
     test_verify_single: function _test_verify_single() {
@@ -561,18 +571,17 @@ function run_test() {
       Assert.ok(!noMAR.exists());
       if (extractedSig.exists()) {
         extractedSig.remove(false);
       }
       extractMARSignature(noMAR, 0, extractedSig, wantFailure);
       Assert.ok(!extractedSig.exists());
     },
     // Between each test make sure the out MAR does not exist.
-    cleanup_per_test: function _cleanup_per_test() {
-    },
+    cleanup_per_test: function _cleanup_per_test() {},
   };
 
   cleanup();
 
   // Run all the tests
   Assert.equal(run_tests(tests), Object.keys(tests).length - 1);
 
   registerCleanupFunction(cleanup);
--- a/modules/libpref/test/unit/head_libPrefs.js
+++ b/modules/libpref/test/unit/head_libPrefs.js
@@ -1,32 +1,39 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 const NS_APP_USER_PROFILE_50_DIR = "ProfD";
 
 function do_check_throws(f, result, stack) {
-  if (!stack)
+  if (!stack) {
     stack = Components.stack.caller;
+  }
 
   try {
     f();
   } catch (exc) {
     equal(exc.result, result, "Correct exception was thrown");
     return;
   }
   ok(false, "expected result " + result + ", none thrown");
 }
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // Register current test directory as provider for the profile directory.
 var provider = {
   getFile(prop, persistent) {
     persistent.value = true;
-    if (prop == NS_APP_USER_PROFILE_50_DIR)
+    if (prop == NS_APP_USER_PROFILE_50_DIR) {
       return Services.dirsvc.get("CurProcD", Ci.nsIFile);
-    throw Components.Exception("Tried to get test directory '" + prop + "'", Cr.NS_ERROR_FAILURE);
+    }
+    throw Components.Exception(
+      "Tried to get test directory '" + prop + "'",
+      Cr.NS_ERROR_FAILURE
+    );
   },
   QueryInterface: ChromeUtils.generateQI(["nsIDirectoryServiceProvider"]),
 };
-Services.dirsvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
+Services.dirsvc
+  .QueryInterface(Ci.nsIDirectoryService)
+  .registerProvider(provider);
--- a/modules/libpref/test/unit/test_changeType.js
+++ b/modules/libpref/test/unit/test_changeType.js
@@ -1,18 +1,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Tests for changing the type of a preference (bug 985998) */
 
 const PREF_INVALID = 0;
-const PREF_BOOL    = 128;
-const PREF_INT     = 64;
-const PREF_STRING  = 32;
+const PREF_BOOL = 128;
+const PREF_INT = 64;
+const PREF_STRING = 32;
 
 function run_test() {
   var ps = Services.prefs;
 
   let defaultBranch = ps.getDefaultBranch("");
   let userBranch = ps.getBranch("");
 
   // Prefs that only have a default value -- we can't change their type.
--- a/modules/libpref/test/unit/test_defaultValues.js
+++ b/modules/libpref/test/unit/test_defaultValues.js
@@ -2,53 +2,58 @@
  * 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/. */
 
 /* Tests for providing a default value to get{Bool,Char,Float,Int}Pref */
 
 function run_test() {
   const ps = Services.prefs;
   let prefName = "test.default.values.bool";
-  do_check_throws(function() { ps.getBoolPref(prefName); },
-                  Cr.NS_ERROR_UNEXPECTED);
+  do_check_throws(function() {
+    ps.getBoolPref(prefName);
+  }, Cr.NS_ERROR_UNEXPECTED);
   strictEqual(ps.getBoolPref(prefName, false), false);
   strictEqual(ps.getBoolPref(prefName, true), true);
   ps.setBoolPref(prefName, true);
   strictEqual(ps.getBoolPref(prefName), true);
   strictEqual(ps.getBoolPref(prefName, false), true);
   strictEqual(ps.getBoolPref(prefName, true), true);
 
   prefName = "test.default.values.char";
-  do_check_throws(function() { ps.getCharPref(prefName); },
-                  Cr.NS_ERROR_UNEXPECTED);
+  do_check_throws(function() {
+    ps.getCharPref(prefName);
+  }, Cr.NS_ERROR_UNEXPECTED);
   strictEqual(ps.getCharPref(prefName, ""), "");
   strictEqual(ps.getCharPref(prefName, "string"), "string");
   ps.setCharPref(prefName, "foo");
   strictEqual(ps.getCharPref(prefName), "foo");
   strictEqual(ps.getCharPref(prefName, "string"), "foo");
 
   prefName = "test.default.values.string";
-  do_check_throws(function() { ps.getCharPref(prefName); },
-                  Cr.NS_ERROR_UNEXPECTED);
+  do_check_throws(function() {
+    ps.getCharPref(prefName);
+  }, Cr.NS_ERROR_UNEXPECTED);
   strictEqual(ps.getStringPref(prefName, ""), "");
   strictEqual(ps.getStringPref(prefName, "éèçàê€"), "éèçàê€");
   ps.setStringPref(prefName, "éèçàê€");
   strictEqual(ps.getStringPref(prefName), "éèçàê€");
   strictEqual(ps.getStringPref(prefName, "string"), "éèçàê€");
 
   prefName = "test.default.values.float";
-  do_check_throws(function() { ps.getFloatPref(prefName); },
-                  Cr.NS_ERROR_UNEXPECTED);
+  do_check_throws(function() {
+    ps.getFloatPref(prefName);
+  }, Cr.NS_ERROR_UNEXPECTED);
   strictEqual(ps.getFloatPref(prefName, 3.5), 3.5);
   strictEqual(ps.getFloatPref(prefName, 0), 0);
   ps.setCharPref(prefName, 1.75);
   strictEqual(ps.getFloatPref(prefName), 1.75);
   strictEqual(ps.getFloatPref(prefName, 3.5), 1.75);
 
   prefName = "test.default.values.int";
-  do_check_throws(function() { ps.getIntPref(prefName); },
-                  Cr.NS_ERROR_UNEXPECTED);
+  do_check_throws(function() {
+    ps.getIntPref(prefName);
+  }, Cr.NS_ERROR_UNEXPECTED);
   strictEqual(ps.getIntPref(prefName, 3), 3);
   strictEqual(ps.getIntPref(prefName, 0), 0);
   ps.setIntPref(prefName, 42);
   strictEqual(ps.getIntPref(prefName), 42);
   strictEqual(ps.getIntPref(prefName, 3), 42);
 }
--- a/modules/libpref/test/unit/test_dirtyPrefs.js
+++ b/modules/libpref/test/unit/test_dirtyPrefs.js
@@ -1,18 +1,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Tests for handling of the preferences 'dirty' flag (bug 985998) */
 
 const PREF_INVALID = 0;
-const PREF_BOOL    = 128;
-const PREF_INT     = 64;
-const PREF_STRING  = 32;
+const PREF_BOOL = 128;
+const PREF_INT = 64;
+const PREF_STRING = 32;
 
 function run_test() {
   const ps = Services.prefs;
 
   let defaultBranch = ps.getDefaultBranch("");
   let userBranch = ps.getBranch("");
 
   let prefFile = do_get_profile();
@@ -52,17 +52,17 @@ function run_test() {
   ps.savePrefFile(null);
 
   // Set a default pref => not dirty (defaults don't go into prefs.js)
   defaultBranch.setBoolPref("DirtyTest.existing.bool", true);
   Assert.ok(!ps.dirty);
   // Fail to change type of a pref with default value -> not dirty
   do_check_throws(function() {
     userBranch.setCharPref("DirtyTest.existing.bool", "boo");
-}, Cr.NS_ERROR_UNEXPECTED);
+  }, Cr.NS_ERROR_UNEXPECTED);
   Assert.ok(!ps.dirty);
 
   // Set user value same as default, not dirty
   userBranch.setBoolPref("DirtyTest.existing.bool", true);
   Assert.ok(!ps.dirty);
   // User value different from default, dirty
   userBranch.setBoolPref("DirtyTest.existing.bool", false);
   Assert.ok(ps.dirty);
--- a/modules/libpref/test/unit/test_libPrefs.js
+++ b/modules/libpref/test/unit/test_libPrefs.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 const PREF_INVALID = 0;
-const PREF_BOOL    = 128;
-const PREF_INT     = 64;
-const PREF_STRING  = 32;
+const PREF_BOOL = 128;
+const PREF_INT = 64;
+const PREF_STRING = 32;
 
 const MAX_PREF_LENGTH = 1 * 1024 * 1024;
 
 function makeList(a) {
   var o = {};
   for (var i = 0; i < a.length; i++) {
     o[a[i]] = "";
   }
@@ -20,69 +20,72 @@ function makeList(a) {
 function run_test() {
   const ps = Services.prefs;
 
   //* *************************************************************************//
   // Nullsafety
 
   do_check_throws(function() {
     ps.getPrefType(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.getBoolPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.setBoolPref(null, false);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.getIntPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.setIntPref(null, 0);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.getCharPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.setCharPref(null, null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.getStringPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.setStringPref(null, null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.clearUserPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.prefHasUserValue(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.lockPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.prefIsLocked(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.unlockPref(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.deleteBranch(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
   do_check_throws(function() {
     ps.getChildList(null);
-}, Cr.NS_ERROR_INVALID_ARG);
+  }, Cr.NS_ERROR_INVALID_ARG);
 
   //* *************************************************************************//
   // Nonexisting user preferences
 
   Assert.equal(ps.prefHasUserValue("UserPref.nonexistent.hasUserValue"), false);
   ps.clearUserPref("UserPref.nonexistent.clearUserPref"); // shouldn't throw
-  Assert.equal(ps.getPrefType("UserPref.nonexistent.getPrefType"), PREF_INVALID);
+  Assert.equal(
+    ps.getPrefType("UserPref.nonexistent.getPrefType"),
+    PREF_INVALID
+  );
   Assert.equal(ps.root, "");
 
   // bool...
   do_check_throws(function() {
     ps.getBoolPref("UserPref.nonexistent.getBoolPref");
   }, Cr.NS_ERROR_UNEXPECTED);
   ps.setBoolPref("UserPref.nonexistent.setBoolPref", false);
   Assert.equal(ps.getBoolPref("UserPref.nonexistent.setBoolPref"), false);
@@ -323,18 +326,19 @@ function run_test() {
   ps.setIntPref("ReadPref.int", 230);
   ps.setCharPref("ReadPref.char", "hello");
 
   // save those prefs in a file
   let savePrefFile = do_get_cwd();
   savePrefFile.append("data");
   savePrefFile.append("savePref.js");
 
-  if (savePrefFile.exists())
+  if (savePrefFile.exists()) {
     savePrefFile.remove(false);
+  }
   savePrefFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o666);
   ps.savePrefFile(savePrefFile);
   ps.resetPrefs();
 
   // load a preexisting pref file
   let prefFile = do_get_file("data/testPref.js");
   ps.readUserPrefsFromFile(prefFile);
 
@@ -391,19 +395,19 @@ function run_test() {
       this.pb = prefBranch;
       this.name = expectedName;
       this.value = expectedValue;
 
       prefBranch.addObserver(expectedName, this);
     }
 
     QueryInterface(aIID) {
-      if (aIID.equals(Ci.nsIObserver) ||
-          aIID.equals(Ci.nsISupports))
+      if (aIID.equals(Ci.nsIObserver) || aIID.equals(Ci.nsISupports)) {
         return this;
+      }
       throw Cr.NS_NOINTERFACE;
     }
 
     observe(aSubject, aTopic, aState) {
       Assert.equal(aTopic, "nsPref:changed");
       Assert.equal(aState, this.name);
       Assert.equal(this.pb.getIntPref(aState), this.value);
       pb.removeObserver(aState, this);
--- a/modules/libpref/test/unit/test_parser.js
+++ b/modules/libpref/test/unit/test_parser.js
@@ -35,53 +35,73 @@ function run_test() {
   Assert.equal(ps.getIntPref("int.INT_MAX-1"), 2147483646);
   Assert.equal(ps.getIntPref("int.INT_MAX"), 2147483647);
   Assert.equal(ps.getIntPref("int.INT_MIN+2"), -2147483646);
   Assert.equal(ps.getIntPref("int.INT_MIN+1"), -2147483647);
   Assert.equal(ps.getIntPref("int.INT_MIN"), -2147483648);
 
   Assert.equal(ps.getCharPref("string.empty"), "");
   Assert.equal(ps.getCharPref("string.abc"), "abc");
-  Assert.equal(ps.getCharPref("string.long"), "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+  Assert.equal(
+    ps.getCharPref("string.long"),
+    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  );
   Assert.equal(ps.getCharPref("string.single-quotes"), '"abc"');
   Assert.equal(ps.getCharPref("string.double-quotes"), "'abc'");
-  Assert.equal(ps.getCharPref("string.weird-chars"),
-              "\x0d \x09 \x0b \x0c \x06 \x16");
-  Assert.equal(ps.getCharPref("string.escapes"), "\" \' \\ \n \r");
+  Assert.equal(
+    ps.getCharPref("string.weird-chars"),
+    "\x0d \x09 \x0b \x0c \x06 \x16"
+  );
+  Assert.equal(ps.getCharPref("string.escapes"), "\" ' \\ \n \r");
 
   // This one is ASCII, so we can use getCharPref() and getStringPref
   // interchangeably.
-  Assert.equal(ps.getCharPref("string.x-escapes1"),
-               "Mozilla0\x4d\x6F\x7a\x69\x6c\x6C\x610");
-  Assert.equal(ps.getStringPref("string.x-escapes1"),
-               "Mozilla0Mozilla0");
+  Assert.equal(
+    ps.getCharPref("string.x-escapes1"),
+    "Mozilla0\x4d\x6F\x7a\x69\x6c\x6C\x610"
+  );
+  Assert.equal(ps.getStringPref("string.x-escapes1"), "Mozilla0Mozilla0");
 
   // This one has chars with value > 127, so it's not valid UTF8, so we can't
   // use getStringPref on it.
-  Assert.equal(ps.getCharPref("string.x-escapes2"),
-               "AA A_umlaut\xc4 y_umlaut\xff");
+  Assert.equal(
+    ps.getCharPref("string.x-escapes2"),
+    "AA A_umlaut\xc4 y_umlaut\xff"
+  );
 
   // The following strings use \uNNNN escapes, which are UTF16 code points.
   // libpref stores them internally as UTF8 byte sequences. In each case we get
   // the string in two ways:
   // - getStringPref() interprets it as UTF8, which is then converted to UTF16
   //   in JS. I.e. code points that are multiple bytes in UTF8 become a single
   //   16-bit char in JS (except for the non-BMP chars, which become a 16-bit
   //   surrogate pair).
   // - getCharPref() interprets it as Latin1, which is then converted to UTF16
   //   in JS. I.e. code points that are multiple bytes in UTF8 become multiple
   //   16-bit chars in JS.
 
-  Assert.equal(ps.getStringPref("string.u-escapes1"),
-               "A\u0041 A_umlaut\u00c4 y_umlaut\u00ff0");
-  Assert.equal(ps.getCharPref("string.u-escapes1"),
-               "A\x41 A_umlaut\xc3\x84 y_umlaut\xc3\xbf0");
+  Assert.equal(
+    ps.getStringPref("string.u-escapes1"),
+    "A\u0041 A_umlaut\u00c4 y_umlaut\u00ff0"
+  );
+  Assert.equal(
+    ps.getCharPref("string.u-escapes1"),
+    "A\x41 A_umlaut\xc3\x84 y_umlaut\xc3\xbf0"
+  );
 
-  Assert.equal(ps.getStringPref("string.u-escapes2"),
-               "S_acute\u015a y_grave\u1Ef3");
-  Assert.equal(ps.getCharPref("string.u-escapes2"),
-               "S_acute\xc5\x9a y_grave\xe1\xbb\xb3");
+  Assert.equal(
+    ps.getStringPref("string.u-escapes2"),
+    "S_acute\u015a y_grave\u1Ef3"
+  );
+  Assert.equal(
+    ps.getCharPref("string.u-escapes2"),
+    "S_acute\xc5\x9a y_grave\xe1\xbb\xb3"
+  );
 
-  Assert.equal(ps.getStringPref("string.u-surrogates"),
-               "cyclone\uD83C\uDF00 grinning_face\uD83D\uDE00");
-  Assert.equal(ps.getCharPref("string.u-surrogates"),
-               "cyclone\xF0\x9F\x8C\x80 grinning_face\xF0\x9F\x98\x80");
+  Assert.equal(
+    ps.getStringPref("string.u-surrogates"),
+    "cyclone\uD83C\uDF00 grinning_face\uD83D\uDE00"
+  );
+  Assert.equal(
+    ps.getCharPref("string.u-surrogates"),
+    "cyclone\xF0\x9F\x8C\x80 grinning_face\xF0\x9F\x98\x80"
+  );
 }
--- a/modules/libpref/test/unit/test_stickyprefs.js
+++ b/modules/libpref/test/unit/test_stickyprefs.js
@@ -57,77 +57,96 @@ add_test(function notWrittenWhenUnchange
 // always be written.
 add_test(function writtenOnceLoadedWithoutChange() {
   // Load the same pref file *as well as* a pref file that has a user_pref for
   // our sticky with the default value. It should be re-written without us
   // touching it.
   resetAndLoadAll();
   // reset and re-read what we just wrote - it should be written.
   saveAndReload();
-  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
-                     "user_pref was written with default value");
+  Assert.strictEqual(
+    ps.getBoolPref("testPref.sticky.bool"),
+    false,
+    "user_pref was written with default value"
+  );
   run_next_test();
 });
 
 // If a sticky pref is explicicitly changed, even to the default, it is written.
 add_test(function writtenOnceLoadedWithChangeNonDefault() {
   // Load the same pref file *as well as* a pref file that has a user_pref for
   // our sticky - then change the pref. It should be written.
   resetAndLoadAll();
   // Set a new val and check we wrote it.
   ps.setBoolPref("testPref.sticky.bool", false);
   saveAndReload();
-  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
-                     "user_pref was written with custom value");
+  Assert.strictEqual(
+    ps.getBoolPref("testPref.sticky.bool"),
+    false,
+    "user_pref was written with custom value"
+  );
   run_next_test();
 });
 
 // If a sticky pref is changed to the non-default value, it is written.
 add_test(function writtenOnceLoadedWithChangeNonDefault() {
   // Load the same pref file *as well as* a pref file that has a user_pref for
   // our sticky - then change the pref. It should be written.
   resetAndLoadAll();
   // Set a new val and check we wrote it.
   ps.setBoolPref("testPref.sticky.bool", true);
   saveAndReload();
-  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), true,
-                     "user_pref was written with custom value");
+  Assert.strictEqual(
+    ps.getBoolPref("testPref.sticky.bool"),
+    true,
+    "user_pref was written with custom value"
+  );
   run_next_test();
 });
 
 // Test that prefHasUserValue always returns true whenever there is a sticky
 // value, even when that value matches the default. This is mainly for
 // about:config semantics - prefs with a sticky value always remain bold and
 // always offer "reset" (which fully resets and drops the sticky value as if
 // the pref had never changed.)
 add_test(function hasUserValue() {
   // sticky pref without user value.
   resetAndLoadDefaults();
   Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
-  Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
-            "should not initially reflect a user value");
+  Assert.ok(
+    !ps.prefHasUserValue("testPref.sticky.bool"),
+    "should not initially reflect a user value"
+  );
 
   ps.setBoolPref("testPref.sticky.bool", false);
-  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
-            "should reflect a user value after set to default");
+  Assert.ok(
+    ps.prefHasUserValue("testPref.sticky.bool"),
+    "should reflect a user value after set to default"
+  );
 
   ps.setBoolPref("testPref.sticky.bool", true);
-  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
-            "should reflect a user value after change to non-default");
+  Assert.ok(
+    ps.prefHasUserValue("testPref.sticky.bool"),
+    "should reflect a user value after change to non-default"
+  );
 
   ps.clearUserPref("testPref.sticky.bool");
-  Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
-            "should reset to no user value");
+  Assert.ok(
+    !ps.prefHasUserValue("testPref.sticky.bool"),
+    "should reset to no user value"
+  );
   ps.setBoolPref("testPref.sticky.bool", false, "expected default");
 
   // And make sure the pref immediately reflects a user value after load.
   resetAndLoadAll();
   Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
-  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
-            "should have a user value when loaded value is the default");
+  Assert.ok(
+    ps.prefHasUserValue("testPref.sticky.bool"),
+    "should have a user value when loaded value is the default"
+  );
   run_next_test();
 });
 
 // Test that clearUserPref removes the "sticky" value.
 add_test(function clearUserPref() {
   // load things such that we have a sticky value which is the same as the
   // default.
   resetAndLoadAll();
@@ -155,11 +174,14 @@ add_test(function observerFires() {
 
   function observe(subject, topic, data) {
     Assert.equal(data, "testPref.sticky.bool");
     ps.removeObserver("testPref.sticky.bool", observe);
     run_next_test();
   }
   ps.addObserver("testPref.sticky.bool", observe);
 
-  ps.setBoolPref("testPref.sticky.bool", ps.getBoolPref("testPref.sticky.bool"));
+  ps.setBoolPref(
+    "testPref.sticky.bool",
+    ps.getBoolPref("testPref.sticky.bool")
+  );
   // and the observer will fire triggering the next text.
 });
--- a/modules/libpref/test/unit/test_warnings.js
+++ b/modules/libpref/test/unit/test_warnings.js
@@ -11,18 +11,22 @@ function makeBuffer(length) {
  * |false| if there was a warning.
  */
 function checkWarning(pref, buffer) {
   return new Promise(resolve => {
     let complete = false;
     let listener = {
       observe(event) {
         let message = event.message;
-        if (!(message.startsWith("Warning: attempting to write")
-              && message.includes(pref))) {
+        if (
+          !(
+            message.startsWith("Warning: attempting to write") &&
+            message.includes(pref)
+          )
+        ) {
           return;
         }
         if (complete) {
           return;
         }
         complete = true;
         info("Warning while setting " + pref);
         Services.console.unregisterListener(listener);
--- a/modules/libpref/test/unit_ipc/test_existing_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_existing_prefs.js
@@ -1,13 +1,16 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
-    let appInfo = Cc["@mozilla.org/xre/app-info;1"];
-    return (!appInfo || Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+  let appInfo = Cc["@mozilla.org/xre/app-info;1"];
+  return (
+    !appInfo ||
+    Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT
+  );
 }
 
 function run_test() {
   if (!isParentProcess()) {
     do_load_child_test_harness();
 
     var pb = Services.prefs;
     pb.setBoolPref("Test.IPC.bool.new", true);
--- a/modules/libpref/test/unit_ipc/test_initial_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_initial_prefs.js
@@ -1,12 +1,12 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
-  return (Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+  return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 }
 
 function run_test() {
   if (!isParentProcess()) {
     const pb = Services.prefs;
     pb.setBoolPref("Test.IPC.bool", true);
     pb.setIntPref("Test.IPC.int", 23);
     pb.setCharPref("Test.IPC.char", "hey");
--- a/modules/libpref/test/unit_ipc/test_large_pref.js
+++ b/modules/libpref/test/unit_ipc/test_large_pref.js
@@ -1,20 +1,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 // Large preferences should not be set in the child process.
 // Non-string preferences are not tested here, because their behavior
 // should not be affected by this filtering.
 //
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
-  return (Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+  return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 }
 
 function makeBuffer(length) {
   let string = "x";
   while (string.length < length) {
     string = string + string;
   }
   if (string.length > length) {
@@ -25,19 +25,19 @@ function makeBuffer(length) {
 
 // from prefapi.h
 const MAX_ADVISABLE_PREF_LENGTH = 4 * 1024;
 
 const largeString = makeBuffer(MAX_ADVISABLE_PREF_LENGTH + 1);
 const smallString = makeBuffer(4);
 
 const testValues = [
-  {name: "None", value: undefined},
-  {name: "Small", value: smallString},
-  {name: "Large", value: largeString},
+  { name: "None", value: undefined },
+  { name: "Small", value: smallString },
+  { name: "Large", value: largeString },
 ];
 
 function prefName(def, user) {
   return "Test.IPC.default" + def.name + "User" + user.name;
 }
 
 function expectedPrefValue(def, user) {
   if (user.value) {
@@ -90,14 +90,16 @@ function run_test() {
         // large, so the preference should not be set.
         let prefExists;
         try {
           let val = pb.getCharPref(pref_name);
           prefExists = val.length > 128;
         } catch (e) {
           prefExists = false;
         }
-        ok(!prefExists,
-          "Pref " + pref_name + " should not be set in the child");
+        ok(
+          !prefExists,
+          "Pref " + pref_name + " should not be set in the child"
+        );
       }
     }
   }
 }
--- a/modules/libpref/test/unit_ipc/test_locked_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_locked_prefs.js
@@ -1,18 +1,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 // Locked status should be communicated to children.
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
-  return (Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+  return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 }
 
 function run_test() {
   const pb = Services.prefs;
 
   let bprefname = "Test.IPC.locked.bool";
   let iprefname = "Test.IPC.locked.int";
   let sprefname = "Test.IPC.locked.string";
@@ -29,10 +29,13 @@ function run_test() {
     pb.lockPref(sprefname);
     pb.unlockPref(sprefname);
 
     run_test_in_child("test_locked_prefs.js");
   }
 
   ok(pb.prefIsLocked(bprefname), bprefname + " should be locked in the child");
   ok(pb.prefIsLocked(iprefname), iprefname + " should be locked in the child");
-  ok(!pb.prefIsLocked(sprefname), sprefname + " should be unlocked in the child");
+  ok(
+    !pb.prefIsLocked(sprefname),
+    sprefname + " should be unlocked in the child"
+  );
 }
--- a/modules/libpref/test/unit_ipc/test_observed_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_observed_prefs.js
@@ -1,12 +1,12 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
-  return (Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT);
+  return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 }
 
 function run_test() {
   if (!isParentProcess()) {
     const pb = Services.prefs;
     Assert.equal(pb.getBoolPref("Test.IPC.bool.new"), true);
     Assert.equal(pb.getIntPref("Test.IPC.int.new"), 23);
     Assert.equal(pb.getCharPref("Test.IPC.char.new"), "hey");
--- a/modules/libpref/test/unit_ipc/test_sharedMap.js
+++ b/modules/libpref/test/unit_ipc/test_sharedMap.js
@@ -4,24 +4,26 @@
 "use strict";
 
 // This file tests the functionality of the preference service when using a
 // shared memory snapshot. In this configuration, a snapshot of the initial
 // state of the preferences database is made when we first spawn a child
 // process, and changes after that point are stored as entries in a dynamic hash
 // table, on top of the snapshot.
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {ExtensionTestUtils} = ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
+);
 
 ExtensionTestUtils.init(this);
 
 let contentPage;
 
-const {prefs} = Services;
+const { prefs } = Services;
 const defaultPrefs = prefs.getDefaultBranch("");
 
 const FRAME_SCRIPT_INIT = `
   ChromeUtils.import("resource://gre/modules/Services.jsm");
   var {prefs} = Services;
   var defaultPrefs = prefs.getDefaultBranch("");
 `;
 
@@ -69,17 +71,25 @@ function getPrefs(prefNames) {
   let result = {};
   for (let pref of prefNames) {
     result[pref] = getPref(pref);
   }
   result.childList = prefs.getChildList("");
   return result;
 }
 
-function checkPref(pref, proc, val, type, userVal, defaultVal, expectedFlags = {}) {
+function checkPref(
+  pref,
+  proc,
+  val,
+  type,
+  userVal,
+  defaultVal,
+  expectedFlags = {}
+) {
   info(`Check "${pref}" ${proc} value`);
 
   equal(val.type, type, `Expected type for "${pref}"`);
   equal(val.user, userVal, `Expected user value for "${pref}"`);
 
   // We only send changes to the content process when they'll make a visible
   // difference, so ignore content process default values when we have a defined
   // user value.
@@ -103,70 +113,97 @@ const TESTS = {
 
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
     },
     contentStartup(PREF, val, childList) {
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
       ok(childList.includes(PREF), `Child list includes "${PREF}"`);
 
       prefs.clearUserPref(PREF);
-      ok(!getPrefList().includes(PREF), `Parent list doesn't include "${PREF}"`);
+      ok(
+        !getPrefList().includes(PREF),
+        `Parent list doesn't include "${PREF}"`
+      );
     },
     contentUpdate1(PREF, val, childList) {
-      ok(!getPrefList().includes(PREF), `Parent list doesn't include "${PREF}"`);
+      ok(
+        !getPrefList().includes(PREF),
+        `Parent list doesn't include "${PREF}"`
+      );
       ok(!childList.includes(PREF), `Child list doesn't include "${PREF}"`);
 
       prefs.setCharPref(PREF, "foo");
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
       checkPref(PREF, "parent", getPref(PREF), "String", "foo");
     },
     contentUpdate2(PREF, val, childList) {
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
       ok(childList.includes(PREF), `Child list includes "${PREF}"`);
 
       checkPref(PREF, "parent", getPref(PREF), "String", "foo");
       checkPref(PREF, "child", val, "String", "foo");
     },
   },
   "doesNotExists.thenDoes": {
     contentStartup(PREF, val, childList) {
-      ok(!getPrefList().includes(PREF), `Parent list doesn't include "${PREF}"`);
+      ok(
+        !getPrefList().includes(PREF),
+        `Parent list doesn't include "${PREF}"`
+      );
       ok(!childList.includes(PREF), `Child list doesn't include "${PREF}"`);
 
       prefs.setIntPref(PREF, 42);
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
     },
     contentUpdate1(PREF, val, childList) {
       ok(getPrefList().includes(PREF), `Parent list includes "${PREF}"`);
       ok(childList.includes(PREF), `Child list includes "${PREF}"`);
 
       checkPref(PREF, "parent", getPref(PREF), "Int", 42);
       checkPref(PREF, "child", val, "Int", 42);
     },
   },
 };
 
 const PREFS = [
-  {type: "Bool", values: [true, false, true]},
-  {type: "Int", values: [24, 42, 73]},
-  {type: "String", values: ["meh", "hem", "hrm"]},
+  { type: "Bool", values: [true, false, true] },
+  { type: "Int", values: [24, 42, 73] },
+  { type: "String", values: ["meh", "hem", "hrm"] },
 ];
 
-for (let {type, values} of PREFS) {
+for (let { type, values } of PREFS) {
   let set = `set${type}Pref`;
 
   function prefTest(opts) {
-    function check(pref, proc, val, {expectedVal, defaultVal = undefined, expectedDefault = defaultVal, expectedFlags = {}}) {
-      checkPref(pref, proc, val, type, expectedVal, expectedDefault, expectedFlags);
+    function check(
+      pref,
+      proc,
+      val,
+      {
+        expectedVal,
+        defaultVal = undefined,
+        expectedDefault = defaultVal,
+        expectedFlags = {},
+      }
+    ) {
+      checkPref(
+        pref,
+        proc,
+        val,
+        type,
+        expectedVal,
+        expectedDefault,
+        expectedFlags
+      );
     }
 
-    function updatePref(PREF,
-                        {userVal = undefined,
-                         defaultVal = undefined,
-                         flags = {}}) {
+    function updatePref(
+      PREF,
+      { userVal = undefined, defaultVal = undefined, flags = {} }
+    ) {
       info(`Update "${PREF}"`);
       if (userVal !== undefined) {
         prefs[set](PREF, userVal);
       }
       if (defaultVal !== undefined) {
         defaultPrefs[set](PREF, defaultVal);
       }
       if (flags.locked === true) {
@@ -206,85 +243,111 @@ for (let {type, values} of PREFS) {
     };
   }
 
   for (let i of [0, 1]) {
     let userVal = values[i];
     let defaultVal = values[+!i];
 
     TESTS[`type.${type}.${i}.default`] = prefTest({
-      initial: {defaultVal, expectedVal: defaultVal},
-      change1: {defaultVal: values[2], expectedVal: values[2]},
+      initial: { defaultVal, expectedVal: defaultVal },
+      change1: { defaultVal: values[2], expectedVal: values[2] },
     });
 
     TESTS[`type.${type}.${i}.user`] = prefTest({
-      initial: {userVal, expectedVal: userVal},
-      change1: {defaultVal: values[2], expectedVal: userVal},
-      change2: {userVal: values[2],
-                expectedDefault: values[2],
-                expectedVal: values[2]},
+      initial: { userVal, expectedVal: userVal },
+      change1: { defaultVal: values[2], expectedVal: userVal },
+      change2: {
+        userVal: values[2],
+        expectedDefault: values[2],
+        expectedVal: values[2],
+      },
     });
 
     TESTS[`type.${type}.${i}.both`] = prefTest({
-      initial: {userVal, defaultVal, expectedVal: userVal},
-      change1: {defaultVal: values[2], expectedVal: userVal},
-      change2: {userVal: values[2],
-                expectedDefault: values[2],
-                expectedVal: values[2]},
+      initial: { userVal, defaultVal, expectedVal: userVal },
+      change1: { defaultVal: values[2], expectedVal: userVal },
+      change2: {
+        userVal: values[2],
+        expectedDefault: values[2],
+        expectedVal: values[2],
+      },
     });
 
     TESTS[`type.${type}.${i}.both.thenLock`] = prefTest({
-      initial: {userVal, defaultVal, expectedVal: userVal},
-      change1: {expectedDefault: defaultVal,
-                expectedVal: defaultVal,
-                flags: {locked: true},
-                expectFlags: {locked: true}},
+      initial: { userVal, defaultVal, expectedVal: userVal },
+      change1: {
+        expectedDefault: defaultVal,
+        expectedVal: defaultVal,
+        flags: { locked: true },
+        expectFlags: { locked: true },
+      },
     });
 
     TESTS[`type.${type}.${i}.both.thenUnlock`] = prefTest({
-      initial: {userVal, defaultVal, expectedVal: defaultVal,
-                flags: {locked: true}, expectedFlags: {locked: true}},
-      change1: {expectedDefault: defaultVal,
-                expectedVal: userVal,
-                flags: {locked: false},
-                expectFlags: {locked: false}},
+      initial: {
+        userVal,
+        defaultVal,
+        expectedVal: defaultVal,
+        flags: { locked: true },
+        expectedFlags: { locked: true },
+      },
+      change1: {
+        expectedDefault: defaultVal,
+        expectedVal: userVal,
+        flags: { locked: false },
+        expectFlags: { locked: false },
+      },
     });
 
     TESTS[`type.${type}.${i}.both.locked`] = prefTest({
-      initial: {userVal, defaultVal, expectedVal: defaultVal,
-                flags: {locked: true}, expectedFlags: {locked: true}},
-      change1: {userVal: values[2],
-                expectedDefault: defaultVal,
-                expectedVal: defaultVal,
-                expectedFlags: {locked: true}},
-      change2: {defaultVal: values[2],
-                expectedDefault: defaultVal,
-                expectedVal: defaultVal,
-                expectedFlags: {locked: true}},
+      initial: {
+        userVal,
+        defaultVal,
+        expectedVal: defaultVal,
+        flags: { locked: true },
+        expectedFlags: { locked: true },
+      },
+      change1: {
+        userVal: values[2],
+        expectedDefault: defaultVal,
+        expectedVal: defaultVal,
+        expectedFlags: { locked: true },
+      },
+      change2: {
+        defaultVal: values[2],
+        expectedDefault: defaultVal,
+        expectedVal: defaultVal,
+        expectedFlags: { locked: true },
+      },
     });
   }
 }
 
 add_task(async function test_sharedMap_prefs() {
   let prefValues = {};
 
   async function runChecks(op) {
     for (let [pref, ops] of Object.entries(TESTS)) {
       if (ops[op]) {
         info(`Running ${op} for "${pref}"`);
-        await ops[op](pref,
-                      prefValues[pref] || undefined,
-                      prefValues.childList || undefined);
+        await ops[op](
+          pref,
+          prefValues[pref] || undefined,
+          prefValues.childList || undefined
+        );
       }
     }
   }
 
   await runChecks("beforeContent");
 
-  contentPage = await ExtensionTestUtils.loadContentPage("about:blank", {remote: true});
+  contentPage = await ExtensionTestUtils.loadContentPage("about:blank", {
+    remote: true,
+  });
   registerCleanupFunction(() => contentPage.close());
 
   contentPage.addFrameScriptHelper(FRAME_SCRIPT_INIT);
   contentPage.addFrameScriptHelper(try_);
   contentPage.addFrameScriptHelper(getPref);
 
   let prefNames = Object.keys(TESTS);
   prefValues = await contentPage.spawn(prefNames, getPrefs);
--- a/modules/libpref/test/unit_ipc/test_sharedMap_var_caches.js
+++ b/modules/libpref/test/unit_ipc/test_sharedMap_var_caches.js
@@ -20,45 +20,61 @@
 // not strictly part of the test.
 
 const PREF1_NAME = "dom.webcomponents.shadowdom.report_usage";
 const PREF1_VALUE = false;
 
 const PREF2_NAME = "dom.mutation-events.cssom.disabled";
 const PREF2_VALUE = true;
 
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {ExtensionTestUtils} = ChromeUtils.import("resource://testing-common/ExtensionXPCShellUtils.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
+);
 
 ExtensionTestUtils.init(this);
 
-const {prefs} = Services;
+const { prefs } = Services;
 const defaultPrefs = prefs.getDefaultBranch("");
 
 add_task(async function test_sharedMap_var_caches() {
-  equal(prefs.getBoolPref(PREF1_NAME), PREF1_VALUE,
-        `Expected initial value for ${PREF1_NAME}`);
-  equal(prefs.getBoolPref(PREF2_NAME), PREF2_VALUE,
-        `Expected initial value for ${PREF2_NAME}`);
+  equal(
+    prefs.getBoolPref(PREF1_NAME),
+    PREF1_VALUE,
+    `Expected initial value for ${PREF1_NAME}`
+  );
+  equal(
+    prefs.getBoolPref(PREF2_NAME),
+    PREF2_VALUE,
+    `Expected initial value for ${PREF2_NAME}`
+  );
 
   defaultPrefs.setBoolPref(PREF1_NAME, !PREF1_VALUE);
   prefs.setBoolPref(PREF2_NAME, !PREF2_VALUE);
 
-  equal(prefs.getBoolPref(PREF1_NAME), !PREF1_VALUE,
-        `Expected updated value for ${PREF1_NAME}`);
-  equal(prefs.getBoolPref(PREF2_NAME), !PREF2_VALUE,
-        `Expected updated value for ${PREF2_NAME}`);
+  equal(
+    prefs.getBoolPref(PREF1_NAME),
+    !PREF1_VALUE,
+    `Expected updated value for ${PREF1_NAME}`
+  );
+  equal(
+    prefs.getBoolPref(PREF2_NAME),
+    !PREF2_VALUE,
+    `Expected updated value for ${PREF2_NAME}`
+  );
 
-  let contentPage = await ExtensionTestUtils.loadContentPage("about:blank", {remote: true});
+  let contentPage = await ExtensionTestUtils.loadContentPage("about:blank", {
+    remote: true,
+  });
   registerCleanupFunction(() => contentPage.close());
 
   /* eslint-disable no-shadow */
-  let values = await contentPage.spawn([PREF1_NAME, PREF2_NAME], (prefs) => {
-    const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+  let values = await contentPage.spawn([PREF1_NAME, PREF2_NAME], prefs => {
+    const { Services } = ChromeUtils.import(
+      "resource://gre/modules/Services.jsm"
+    );
     return prefs.map(pref => Services.prefs.getBoolPref(pref));
   });
   /* eslint-enable no-shadow */
 
-  equal(values[0], !PREF1_VALUE,
-        `Expected content value for ${PREF1_NAME}`);
-  equal(values[1], !PREF2_VALUE,
-        `Expected content value for ${PREF2_NAME}`);
+  equal(values[0], !PREF1_VALUE, `Expected content value for ${PREF1_NAME}`);
+  equal(values[1], !PREF2_VALUE, `Expected content value for ${PREF2_NAME}`);
 });
--- a/modules/libpref/test/unit_ipc/test_update_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_update_prefs.js
@@ -1,9 +1,9 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function isParentProcess() {
   return Services.appinfo.processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 }
 
 function run_test() {
   if (isParentProcess()) {
     do_load_child_test_harness();
@@ -19,17 +19,18 @@ function run_test() {
   }
 }
 
 function testPrefClear() {
   var pb = Services.prefs;
   pb.clearUserPref("Test.IPC.bool.new");
 
   sendCommand(
-'var pb = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);\n' +
-'pb.prefHasUserValue("Test.IPC.bool.new");\n',
-    checkWasCleared);
+    'var pb = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);\n' +
+      'pb.prefHasUserValue("Test.IPC.bool.new");\n',
+    checkWasCleared
+  );
 }
 
 function checkWasCleared(existsStr) {
-    Assert.equal(existsStr, "false");
-    do_test_finished();
+  Assert.equal(existsStr, "false");
+  do_test_finished();
 }
--- a/modules/libpref/test/unit_ipc/test_user_default_prefs.js
+++ b/modules/libpref/test/unit_ipc/test_user_default_prefs.js
@@ -1,29 +1,34 @@
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const pb = Services.prefs;
 
 // This pref is chosen somewhat arbitrarily --- we just need one
 // that's guaranteed to have a default value.
 const kPrefName = "intl.accept_languages"; // of type char, which we
-                                           // assume below
+// assume below
 var initialValue = null;
 
 function check_child_pref_info_eq(continuation) {
   sendCommand(
     'var pb = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);\n' +
-    // Returns concatenation "[value],[isUser]"
-    'pb.getCharPref("' + kPrefName + '")+ "," +' +
-    'pb.prefHasUserValue("' + kPrefName + '");',
+      // Returns concatenation "[value],[isUser]"
+      'pb.getCharPref("' +
+      kPrefName +
+      '")+ "," +' +
+      'pb.prefHasUserValue("' +
+      kPrefName +
+      '");',
     function(info) {
-      let [ value, isUser ] = info.split(",");
+      let [value, isUser] = info.split(",");
       Assert.equal(pb.getCharPref(kPrefName), value);
       Assert.equal(pb.prefHasUserValue(kPrefName), isUser == "true");
       continuation();
-    });
+    }
+  );
 }
 
 function run_test() {
   // We finish in clean_up()
   do_test_pending();
 
   initialValue = pb.getCharPref(kPrefName);