diff --git a/.eslintignore b/.eslintignore
index c327eb4e0146..0ffae8f7a2be 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -96,10 +96,13 @@ devtools/client/shared/*.jsm
 devtools/client/shared/webgl-utils.js
 devtools/client/shared/widgets/*.jsm
 devtools/client/webaudioeditor/**
-devtools/client/webconsole/**
-!devtools/client/webconsole/panel.js
-!devtools/client/webconsole/jsterm.js
-!devtools/client/webconsole/console-commands.js
+devtools/client/webconsole/net/**
+devtools/client/webconsole/test/**
+devtools/client/webconsole/console-output.js
+devtools/client/webconsole/hudservice.js
+devtools/client/webconsole/utils.js
+devtools/client/webconsole/webconsole-connection-proxy.js
+devtools/client/webconsole/webconsole.js
 devtools/client/webide/**
 !devtools/client/webide/components/webideCli.js
 devtools/server/*.js
diff --git a/devtools/client/webconsole/new-console-output/.eslintrc.js b/devtools/client/webconsole/new-console-output/.eslintrc.js
new file mode 100644
index 000000000000..9b5bf41191f8
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/.eslintrc.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+  "env": { "browser": true }
+};
diff --git a/devtools/client/webconsole/new-console-output/components/console-output.js b/devtools/client/webconsole/new-console-output/components/console-output.js
index cb85b0fd3eb6..7acb79233e38 100644
--- a/devtools/client/webconsole/new-console-output/components/console-output.js
+++ b/devtools/client/webconsole/new-console-output/components/console-output.js
@@ -9,7 +9,6 @@ const {
   DOM: dom,
   PropTypes
 } = require("devtools/client/shared/vendor/react");
-const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 
 const {
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index 76f6f63173d5..95fc54950117 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -63,7 +63,8 @@ const Message = createClass({
       // Event used in tests. Some message types don't pass it in because existing tests
       // did not emit for them.
       if (this.props.serviceContainer) {
-        this.props.serviceContainer.emitNewMessage(this.messageNode, this.props.messageId);
+        this.props.serviceContainer.emitNewMessage(
+          this.messageNode, this.props.messageId);
       }
     }
   },
diff --git a/devtools/client/webconsole/new-console-output/main.js b/devtools/client/webconsole/new-console-output/main.js
index 29db5e33785e..a370e56be013 100644
--- a/devtools/client/webconsole/new-console-output/main.js
+++ b/devtools/client/webconsole/new-console-output/main.js
@@ -8,7 +8,6 @@
 
 var { utils: Cu } = Components;
 
-const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 const { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
 
 // Initialize module loader and load all modules of the new inline
@@ -19,5 +18,6 @@ const NewConsoleOutputWrapper = BrowserLoader({
   window}).require("./new-console-output-wrapper");
 
 this.NewConsoleOutput = function (parentNode, jsterm, toolbox, owner, serviceContainer) {
-  return new NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner, serviceContainer);
+  return new NewConsoleOutputWrapper(
+    parentNode, jsterm, toolbox, owner, serviceContainer);
 };
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/head.js b/devtools/client/webconsole/new-console-output/test/chrome/head.js
index e8a5fd22e23f..f4b3dca91299 100644
--- a/devtools/client/webconsole/new-console-output/test/chrome/head.js
+++ b/devtools/client/webconsole/new-console-output/test/chrome/head.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
+/* exported Task, browserRequire */
 
 "use strict";
 
 var { utils: Cu } = Components;
 
 var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-var { Assert } = require("resource://testing-common/Assert.jsm");
 var { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
 var { Task } = require("devtools/shared/task");
 
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html b/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
index d22819a2bed1..606559665360 100644
--- a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
@@ -13,6 +13,8 @@
 <div id="output"></div>
 
 <script type="text/javascript;version=1.8">
+"use strict";
+
 const testPackets = [];
 const numMessages = 1000;
 for (let id = 0; id < numMessages; id++) {
@@ -57,9 +59,12 @@ function timeit(cb) {
 }
 
 window.onload = Task.async(function* () {
-  const { configureStore } = browserRequire("devtools/client/webconsole/new-console-output/store");
-  const { filterTextSet, filtersClear } = browserRequire("devtools/client/webconsole/new-console-output/actions/index");
-  const NewConsoleOutputWrapper = browserRequire("devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+  const { configureStore } = browserRequire(
+    "devtools/client/webconsole/new-console-output/store");
+  const { filterTextSet, filtersClear } = browserRequire(
+    "devtools/client/webconsole/new-console-output/actions/index");
+  const NewConsoleOutputWrapper = browserRequire(
+    "devtools/client/webconsole/new-console-output/new-console-output-wrapper");
   const wrapper = new NewConsoleOutputWrapper(document.querySelector("#output"), {});
 
   const store = configureStore();
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
index cc6fda6bd044..8011d6bd8259 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
@@ -34,7 +34,9 @@ describe("ConsoleAPICall component:", () => {
 
       expect(wrapper.find(".message-body").text()).toBe("foobar test");
       expect(wrapper.find(".objectBox-string").length).toBe(2);
-      expect(wrapper.find("div.message.cm-s-mozilla span span.message-flex-body span.message-body.devtools-monospace").length).toBe(1);
+      let selector = "div.message.cm-s-mozilla span span.message-flex-body " +
+        "span.message-body.devtools-monospace";
+      expect(wrapper.find(selector).length).toBe(1);
 
       // There should be the location
       const locationLink = wrapper.find(`.message-location`);
@@ -75,7 +77,9 @@ describe("ConsoleAPICall component:", () => {
       expect(wrapper.find(".message-repeats").text()).toBe("107");
       expect(wrapper.find(".message-repeats").prop("title")).toBe("107 repeats");
 
-      expect(wrapper.find("span > span.message-flex-body > span.message-body.devtools-monospace + span.message-repeats").length).toBe(1);
+      let selector = "span > span.message-flex-body > " +
+        "span.message-body.devtools-monospace + span.message-repeats";
+      expect(wrapper.find(selector).length).toBe(1);
     });
 
     it("has the expected indent", () => {
@@ -111,10 +115,12 @@ describe("ConsoleAPICall component:", () => {
 
   describe("console.assert", () => {
     it("renders", () => {
-      const message = stubPreparedMessages.get("console.assert(false, {message: 'foobar'})");
+      const message = stubPreparedMessages.get(
+        "console.assert(false, {message: 'foobar'})");
       const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
 
-      expect(wrapper.find(".message-body").text()).toBe("Assertion failed: Object { message: \"foobar\" }");
+      expect(wrapper.find(".message-body").text())
+        .toBe("Assertion failed: Object { message: \"foobar\" }");
     });
   });
 
@@ -145,19 +151,26 @@ describe("ConsoleAPICall component:", () => {
 
       expect(wrapper.find(".message-body").text()).toBe("console.trace()");
 
-      const frameLinks = wrapper.find(`.stack-trace span.frame-link[data-url='${filepath}']`);
+      const frameLinks = wrapper.find(
+        `.stack-trace span.frame-link[data-url='${filepath}']`);
       expect(frameLinks.length).toBe(3);
 
-      expect(frameLinks.eq(0).find(".frame-link-function-display-name").text()).toBe("testStacktraceFiltering");
-      expect(frameLinks.eq(0).find(".frame-link-filename").text()).toBe(filepath);
+      expect(frameLinks.eq(0).find(".frame-link-function-display-name").text())
+        .toBe("testStacktraceFiltering");
+      expect(frameLinks.eq(0).find(".frame-link-filename").text())
+        .toBe(filepath);
 
-      expect(frameLinks.eq(1).find(".frame-link-function-display-name").text()).toBe("foo");
-      expect(frameLinks.eq(1).find(".frame-link-filename").text()).toBe(filepath);
+      expect(frameLinks.eq(1).find(".frame-link-function-display-name").text())
+        .toBe("foo");
+      expect(frameLinks.eq(1).find(".frame-link-filename").text())
+        .toBe(filepath);
 
-      expect(frameLinks.eq(2).find(".frame-link-function-display-name").text()).toBe("triggerPacket");
-      expect(frameLinks.eq(2).find(".frame-link-filename").text()).toBe(filepath);
+      expect(frameLinks.eq(2).find(".frame-link-function-display-name").text())
+        .toBe("triggerPacket");
+      expect(frameLinks.eq(2).find(".frame-link-filename").text())
+        .toBe(filepath);
 
-      //it should not be collapsible.
+      // it should not be collapsible.
       expect(wrapper.find(`.theme-twisty`).length).toBe(0);
     });
   });
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
index 23f958cd9472..a942936d967f 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
@@ -40,7 +40,8 @@ describe("FilterBar component:", () => {
     expect(toolbar.children().eq(1).attr("title")).toBe("Toggle filter bar");
 
     // Text filter
-    expect(toolbar.children().eq(2).attr("class")).toBe("devtools-plaininput text-filter");
+    expect(toolbar.children().eq(2).attr("class"))
+      .toBe("devtools-plaininput text-filter");
     expect(toolbar.children().eq(2).attr("placeholder")).toBe("Filter output");
     expect(toolbar.children().eq(2).attr("type")).toBe("search");
     expect(toolbar.children().eq(2).attr("value")).toBe("");
@@ -71,7 +72,8 @@ describe("FilterBar component:", () => {
       { label: "Warnings", filterKey: MESSAGE_LEVEL.WARN }));
     const errorButton = FilterButton(Object.assign({}, buttonProps,
       { label: "Errors", filterKey: MESSAGE_LEVEL.ERROR }));
-    expect(wrapper.contains([errorButton, warnButton, logButton, infoButton, debugButton])).toBe(true);
+    let buttons = [errorButton, warnButton, logButton, infoButton, debugButton];
+    expect(wrapper.contains(buttons)).toBe(true);
   });
 
   it("fires MESSAGES_CLEAR action when clear button is clicked", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js b/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
index 037d4ca27afb..2aa550a9e61b 100644
--- a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
@@ -32,7 +32,9 @@ describe("NetworkEventMessage component:", () => {
       expect(wrapper.find(".message-body .xhr").length).toBe(0);
       expect(wrapper.find(".message-body .url").length).toBe(1);
       expect(wrapper.find(".message-body .url").text()).toBe(EXPECTED_URL);
-      expect(wrapper.find("div.message.cm-s-mozilla span.message-body.devtools-monospace").length).toBe(1);
+      expect(wrapper
+        .find("div.message.cm-s-mozilla span.message-body.devtools-monospace").length
+      ).toBe(1);
     });
 
     it("has the expected indent", () => {
@@ -57,7 +59,8 @@ describe("NetworkEventMessage component:", () => {
       expect(wrapper.find(".message-body .xhr").length).toBe(1);
       expect(wrapper.find(".message-body .xhr").text()).toBe("XHR");
       expect(wrapper.find(".message-body .url").text()).toBe(EXPECTED_URL);
-      expect(wrapper.find("div.message.cm-s-mozilla span.message-body.devtools-monospace").length).toBe(1);
+      let selector = "div.message.cm-s-mozilla span.message-body.devtools-monospace";
+      expect(wrapper.find(selector).length).toBe(1);
     });
   });
 
@@ -71,7 +74,8 @@ describe("NetworkEventMessage component:", () => {
       expect(wrapper.find(".message-body .xhr").text()).toBe("XHR");
       expect(wrapper.find(".message-body .url").length).toBe(1);
       expect(wrapper.find(".message-body .url").text()).toBe(EXPECTED_URL);
-      expect(wrapper.find("div.message.cm-s-mozilla span.message-body.devtools-monospace").length).toBe(1);
+      let selector = "div.message.cm-s-mozilla span.message-body.devtools-monospace";
+      expect(wrapper.find(selector).length);
     });
   });
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/Services.js b/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
index 61b3d5e13845..b940c027de5f 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/Services.js
@@ -12,6 +12,7 @@ module.exports = {
         case "devtools.hud.loglimit":
           return 1000;
       }
+      return null;
     },
     getBoolPref: pref => {
       const falsey = [
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js b/devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js
index 04b15c88bcd0..3c117cf96808 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js
@@ -13,5 +13,6 @@ module.exports = {
     subscribe: () => {},
   },
   openLink: () => {},
+  // eslint-disable-next-line react/display-name
   createElement: tagName => document.createElement(tagName)
 };
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
index fc859a0029eb..fa7990474b64 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
@@ -4,9 +4,9 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
-requestLongerTimeout(2)
+requestLongerTimeout(2);
 
-Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", {});
 const { consoleApi: snippets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
@@ -17,7 +17,7 @@ let stubs = {
 };
 
 add_task(function* () {
-  for (var [key, {keys, code}] of snippets) {
+  for (let [key, {keys, code}] of snippets) {
     yield OS.File.writeAtomic(TEMP_FILE_PATH, `function triggerPacket() {${code}}`);
 
     let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole");
@@ -31,7 +31,7 @@ add_task(function* () {
       let listener = (type, res) => {
         stubs.packets.push(formatPacket(keys[i], res));
         stubs.preparedMessages.push(formatStub(keys[i], res));
-        if(++i === keys.length ){
+        if (++i === keys.length) {
           toolbox.target.client.removeListener("consoleAPICall", listener);
           resolve();
         }
@@ -39,10 +39,12 @@ add_task(function* () {
       toolbox.target.client.addListener("consoleAPICall", listener);
     });
 
-    yield ContentTask.spawn(gBrowser.selectedBrowser, key, function(key) {
-      var script = content.document.createElement("script");
-      script.src = "test-tempfile.js?key=" + encodeURIComponent(key);
-      script.onload = function() { content.wrappedJSObject.triggerPacket(); }
+    yield ContentTask.spawn(gBrowser.selectedBrowser, key, function (subKey) {
+      let script = content.document.createElement("script");
+      script.src = "test-tempfile.js?key=" + encodeURIComponent(subKey);
+      script.onload = function () {
+        content.wrappedJSObject.triggerPacket();
+      };
       content.document.body.appendChild(script);
     });
 
@@ -51,6 +53,6 @@ add_task(function* () {
     yield closeTabAndToolbox();
   }
   let filePath = OS.Path.join(`${BASE_PATH}/stubs`, "consoleApi.js");
-  OS.File.writeAtomic(filePath, formatFile(stubs));
+  OS.File.writeAtomic(filePath, formatFile(stubs, "ConsoleMessage"));
   OS.File.writeAtomic(TEMP_FILE_PATH, "");
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
index 3a27067756d3..99a2fb64deb2 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", {});
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html";
 
 const { cssMessage: snippets} = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
@@ -43,6 +43,6 @@ add_task(function* () {
   }
 
   let filePath = OS.Path.join(`${BASE_PATH}/stubs`, "cssMessage.js");
-  OS.File.writeAtomic(filePath, formatFile(stubs));
+  OS.File.writeAtomic(filePath, formatFile(stubs, "ConsoleMessage"));
   OS.File.writeAtomic(TEMP_CSS_FILE_PATH, "");
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
index 507201a24499..42c8a383c9a3 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", {});
 const TEST_URI = "data:text/html;charset=utf-8,stub generation";
 
 const { evaluationResult: snippets} = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
@@ -19,7 +19,7 @@ add_task(function* () {
   let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole");
   ok(true, "make the test not fail");
 
-  for (var [code,key] of snippets) {
+  for (let [code, key] of snippets) {
     const packet = yield new Promise(resolve => {
       toolbox.target.activeConsole.evaluateJS(code, resolve);
     });
@@ -28,5 +28,5 @@ add_task(function* () {
   }
 
   let filePath = OS.Path.join(`${BASE_PATH}/stubs`, "evaluationResult.js");
-  OS.File.writeAtomic(filePath, formatFile(stubs));
+  OS.File.writeAtomic(filePath, formatFile(stubs, "ConsoleMessage"));
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
index cc018f634eb6..5d42935a0393 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", {});
 const TARGET = "networkEvent";
 const { [TARGET]: snippets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html";
@@ -16,7 +16,7 @@ let stubs = {
 };
 
 add_task(function* () {
-  for (var [key, {keys, code}] of snippets) {
+  for (let {keys, code} of snippets.values()) {
     OS.File.writeAtomic(TEMP_FILE_PATH, `function triggerPacket() {${code}}`);
     let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole");
     let {ui} = toolbox.getCurrentPanel().hud;
@@ -29,19 +29,19 @@ add_task(function* () {
       toolbox.target.client.addListener(TARGET, (type, res) => {
         stubs.packets.push(formatPacket(keys[i], res));
         stubs.preparedMessages.push(formatNetworkStub(keys[i], res));
-        if(++i === keys.length ){
+        if (++i === keys.length) {
           resolve();
         }
       });
     });
 
-    yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
+    yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function () {
       content.wrappedJSObject.triggerPacket();
     });
 
     yield received;
   }
   let filePath = OS.Path.join(`${BASE_PATH}/stubs/${TARGET}.js`);
-  OS.File.writeAtomic(filePath, formatFile(stubs));
+  OS.File.writeAtomic(filePath, formatFile(stubs, "NetworkEventMessage"));
   OS.File.writeAtomic(TEMP_FILE_PATH, "");
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
index 9323e0031b44..21c50185c47b 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", {});
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
 
 const { pageError: snippets} = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
@@ -19,7 +19,7 @@ add_task(function* () {
   let toolbox = yield openNewTabAndToolbox(TEST_URI, "webconsole");
   ok(true, "make the test not fail");
 
-  for (var [key,code] of snippets) {
+  for (let [key, code] of snippets) {
     OS.File.writeAtomic(TEMP_FILE_PATH, `${code}`);
     let received = new Promise(resolve => {
       toolbox.target.client.addListener("pageError", function onPacket(e, packet) {
@@ -33,9 +33,9 @@ add_task(function* () {
       });
     });
 
-    yield ContentTask.spawn(gBrowser.selectedBrowser, key, function(key) {
-      var script = content.document.createElement("script");
-      script.src = "test-tempfile.js?key=" + encodeURIComponent(key);
+    yield ContentTask.spawn(gBrowser.selectedBrowser, key, function (subKey) {
+      let script = content.document.createElement("script");
+      script.src = "test-tempfile.js?key=" + encodeURIComponent(subKey);
       content.document.body.appendChild(script);
     });
 
@@ -43,6 +43,6 @@ add_task(function* () {
   }
 
   let filePath = OS.Path.join(`${BASE_PATH}/stubs`, "pageError.js");
-  OS.File.writeAtomic(filePath, formatFile(stubs));
+  OS.File.writeAtomic(filePath, formatFile(stubs, "ConsoleMessage"));
   OS.File.writeAtomic(TEMP_FILE_PATH, "");
 });
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
index 42da0cbe7957..2a3d5511f911 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
@@ -2,8 +2,9 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* import-globals-from ../../../../framework/test/shared-head.js */
-
+/* import-globals-from ../../../../../framework/test/shared-head.js */
+/* exported TEMP_FILE_PATH, TEMP_CSS_FILE_PATH, formatPacket, formatStub,
+            formatNetworkStub, formatFile */
 "use strict";
 
 // shared-head.js handles imports, constants, and utility functions
@@ -20,7 +21,8 @@ registerCleanupFunction(() => {
 const { prepareMessage } = require("devtools/client/webconsole/new-console-output/utils/messages");
 const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js");
 
-const BASE_PATH = "../../../../devtools/client/webconsole/new-console-output/test/fixtures";
+const BASE_PATH =
+  "../../../../devtools/client/webconsole/new-console-output/test/fixtures";
 const TEMP_FILE_PATH = OS.Path.join(`${BASE_PATH}/stub-generators`, "test-tempfile.js");
 const TEMP_CSS_FILE_PATH = OS.Path.join(`${BASE_PATH}/stub-generators`,
                                         "test-tempfile.css");
@@ -28,7 +30,7 @@ const TEMP_CSS_FILE_PATH = OS.Path.join(`${BASE_PATH}/stub-generators`,
 let cachedPackets = {};
 
 function getCleanedPacket(key, packet) {
-  if(Object.keys(cachedPackets).includes(key)) {
+  if (Object.keys(cachedPackets).includes(key)) {
     return cachedPackets[key];
   }
 
@@ -44,7 +46,6 @@ function getCleanedPacket(key, packet) {
   // the diff resulting from this stub generation.
   let res;
   if (stubPackets.has(safeKey)) {
-
     let existingPacket = stubPackets.get(safeKey);
     res = Object.assign({}, packet, {
       from: existingPacket.from
@@ -84,7 +85,7 @@ function getCleanedPacket(key, packet) {
       // Clean actor ids on evaluation result messages.
       res.result.actor = existingPacket.result.actor;
       if (res.result.preview) {
-        if(res.result.preview.timestamp) {
+        if (res.result.preview.timestamp) {
           // Clean timestamp there too.
           res.result.preview.timestamp = existingPacket.result.preview.timestamp;
         }
@@ -95,7 +96,7 @@ function getCleanedPacket(key, packet) {
       // Clean actor ids on exception messages.
       res.exception.actor = existingPacket.exception.actor;
       if (res.exception.preview) {
-        if(res.exception.preview.timestamp) {
+        if (res.exception.preview.timestamp) {
           // Clean timestamp there too.
           res.exception.preview.timestamp = existingPacket.exception.preview.timestamp;
         }
@@ -113,7 +114,6 @@ function getCleanedPacket(key, packet) {
       // Clean timeStamp on pageError messages.
       res.pageError.timeStamp = existingPacket.pageError.timeStamp;
     }
-
   } else {
     res = packet;
   }
@@ -123,9 +123,8 @@ function getCleanedPacket(key, packet) {
 }
 
 function formatPacket(key, packet) {
-  return `
-stubPackets.set("${key}", ${JSON.stringify(getCleanedPacket(key, packet), null, "\t")});
-`;
+  let stringifiedPacket = JSON.stringify(getCleanedPacket(key, packet), null, 2);
+  return `stubPackets.set("${key}", ${stringifiedPacket});`;
 }
 
 function formatStub(key, packet) {
@@ -133,10 +132,8 @@ function formatStub(key, packet) {
     getCleanedPacket(key, packet),
     {getNextId: () => "1"}
   );
-
-  return `
-stubPreparedMessages.set("${key}", new ConsoleMessage(${JSON.stringify(prepared, null, "\t")}));
-`;
+  let stringifiedMessage = JSON.stringify(prepared, null, 2);
+  return `stubPreparedMessages.set("${key}", new ConsoleMessage(${stringifiedMessage}));`;
 }
 
 function formatNetworkStub(key, packet) {
@@ -164,14 +161,15 @@ function formatNetworkStub(key, packet) {
     fromServiceWorker: actor.fromServiceWorker
   };
   let prepared = prepareMessage(networkInfo, {getNextId: () => "1"});
-  return `
-stubPreparedMessages.set("${key}", new NetworkEventMessage(${JSON.stringify(prepared, null, "\t")}));
-`;
+  let stringifiedMessage = JSON.stringify(prepared, null, 2);
+  return `stubPreparedMessages.set("${key}", ` +
+    `new NetworkEventMessage(${stringifiedMessage}));`;
 }
 
-function formatFile(stubs) {
+function formatFile(stubs, type) {
   return `/* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -179,16 +177,18 @@ function formatFile(stubs) {
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { ${type} } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
+${stubs.preparedMessages.join("\n\n")}
 
-${stubs.preparedMessages.join("")}
-${stubs.packets.join("")}
+${stubs.packets.join("\n\n")}
 
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}`;
+};
+`;
 }
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
index c7b9da3c3fc0..ba50cf2311d6 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
@@ -3,10 +3,6 @@
 
 "use strict";
 
-var {DebuggerServer} = require("devtools/server/main");
-var longString = (new Array(DebuggerServer.LONG_STRING_LENGTH + 4)).join("a");
-var initialString = longString.substring(0, DebuggerServer.LONG_STRING_INITIAL_LENGTH);
-
 // Console API
 
 const consoleApiCommands = [
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
index bd4d4d6311f3..039b14998b09 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -7,1500 +8,1305 @@
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleMessage } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-
-
 stubPreparedMessages.set("console.log('foobar', 'test')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159894798,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"foobar",
-		"test"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159894798,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159894798,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "foobar",
+    "test"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159894798,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log(undefined)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159896036,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "undefined"
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159896036,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159896036,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "undefined"
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159896036,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.warn('danger, will robinson!')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159897333,
-	"type": "warn",
-	"level": "warn",
-	"messageText": null,
-	"parameters": [
-		"danger, will robinson!"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159897333,\"type\":\"warn\",\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159897333,
+  "type": "warn",
+  "level": "warn",
+  "messageText": null,
+  "parameters": [
+    "danger, will robinson!"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159897333,\"type\":\"warn\",\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log(NaN)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159898667,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "NaN"
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159898667,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159898667,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "NaN"
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159898667,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log(null)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159900151,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "null"
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159900151,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159900151,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "null"
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159900151,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log('鼬')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159901470,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"鼬"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159901470,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159901470,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "鼬"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159901470,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.clear()", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159902721,
-	"type": "clear",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"Console was cleared."
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159902721,\"type\":\"clear\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159902721,
+  "type": "clear",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "Console was cleared."
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159902721,\"type\":\"clear\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.count('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159903982,
-	"type": "log",
-	"level": "debug",
-	"messageText": "bar: 1",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159903982,\"type\":\"log\",\"level\":\"debug\",\"messageText\":\"bar: 1\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159903982,
+  "type": "log",
+  "level": "debug",
+  "messageText": "bar: 1",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159903982,\"type\":\"log\",\"level\":\"debug\",\"messageText\":\"bar: 1\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.assert(false, {message: 'foobar'})", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159905182,
-	"type": "assert",
-	"level": "error",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "object",
-			"actor": "server1.conn8.child1/obj31",
-			"class": "Object",
-			"extensible": true,
-			"frozen": false,
-			"sealed": false,
-			"ownPropertyLength": 1,
-			"preview": {
-				"kind": "Object",
-				"ownProperties": {
-					"message": {
-						"configurable": true,
-						"enumerable": true,
-						"writable": true,
-						"value": "foobar"
-					}
-				},
-				"ownPropertiesLength": 1,
-				"safeGetterValues": {}
-			}
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159905182,\"type\":\"assert\",\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn8.child1/obj31\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownPropertiesLength\":1,\"safeGetterValues\":{}}}],\"repeatId\":null,\"stacktrace\":[{\"columnNumber\":27,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)\",\"functionName\":\"triggerPacket\",\"language\":2,\"lineNumber\":1}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": [
-		{
-			"columnNumber": 27,
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
-			"functionName": "triggerPacket",
-			"language": 2,
-			"lineNumber": 1
-		}
-	],
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159905182,
+  "type": "assert",
+  "level": "error",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "object",
+      "actor": "server1.conn8.child1/obj31",
+      "class": "Object",
+      "extensible": true,
+      "frozen": false,
+      "sealed": false,
+      "ownPropertyLength": 1,
+      "preview": {
+        "kind": "Object",
+        "ownProperties": {
+          "message": {
+            "configurable": true,
+            "enumerable": true,
+            "writable": true,
+            "value": "foobar"
+          }
+        },
+        "ownPropertiesLength": 1,
+        "safeGetterValues": {}
+      }
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159905182,\"type\":\"assert\",\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn8.child1/obj31\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownPropertiesLength\":1,\"safeGetterValues\":{}}}],\"repeatId\":null,\"stacktrace\":[{\"columnNumber\":27,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)\",\"functionName\":\"triggerPacket\",\"language\":2,\"lineNumber\":1}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": [
+    {
+      "columnNumber": 27,
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
+      "functionName": "triggerPacket",
+      "language": 2,
+      "lineNumber": 1
+    }
+  ],
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log('hello \nfrom \rthe \"string world!')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159906444,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"hello \nfrom \rthe \"string world!"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159906444,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159906444,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "hello \nfrom \rthe \"string world!"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159906444,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log('úṇĩçödê țĕșť')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159907704,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"úṇĩçödê țĕșť"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159907704,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159907704,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "úṇĩçödê țĕșť"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159907704,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.dirxml(window)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159908948,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "object",
-			"actor": "server1.conn11.child1/obj31",
-			"class": "Window",
-			"extensible": true,
-			"frozen": false,
-			"sealed": false,
-			"ownPropertyLength": 812,
-			"preview": {
-				"kind": "ObjectWithURL",
-				"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
-			}
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159908948,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn11.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":812,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\"}}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)",
-		"line": 1,
-		"column": 27
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159908948,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "object",
+      "actor": "server1.conn11.child1/obj31",
+      "class": "Window",
+      "extensible": true,
+      "frozen": false,
+      "sealed": false,
+      "ownPropertyLength": 811,
+      "preview": {
+        "kind": "ObjectWithURL",
+        "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+      }
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159908948,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn11.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":811,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\"}}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)\",\"line\":1,\"column\":27},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)",
+    "line": 1,
+    "column": 27
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.trace()", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159910198,
-	"type": "trace",
-	"level": "log",
-	"messageText": null,
-	"parameters": [],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159910198,\"type\":\"trace\",\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"repeatId\":null,\"stacktrace\":[{\"columnNumber\":3,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"testStacktraceFiltering\",\"language\":2,\"lineNumber\":3},{\"columnNumber\":3,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"foo\",\"language\":2,\"lineNumber\":6},{\"columnNumber\":1,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"triggerPacket\",\"language\":2,\"lineNumber\":9}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"line\":3,\"column\":3},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": [
-		{
-			"columnNumber": 3,
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-			"functionName": "testStacktraceFiltering",
-			"language": 2,
-			"lineNumber": 3
-		},
-		{
-			"columnNumber": 3,
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-			"functionName": "foo",
-			"language": 2,
-			"lineNumber": 6
-		},
-		{
-			"columnNumber": 1,
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-			"functionName": "triggerPacket",
-			"language": 2,
-			"lineNumber": 9
-		}
-	],
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-		"line": 3,
-		"column": 3
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159910198,
+  "type": "trace",
+  "level": "log",
+  "messageText": null,
+  "parameters": [],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159910198,\"type\":\"trace\",\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"repeatId\":null,\"stacktrace\":[{\"columnNumber\":3,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"testStacktraceFiltering\",\"language\":2,\"lineNumber\":3},{\"columnNumber\":3,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"foo\",\"language\":2,\"lineNumber\":6},{\"columnNumber\":1,\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"functionName\":\"triggerPacket\",\"language\":2,\"lineNumber\":9}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()\",\"line\":3,\"column\":3},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": [
+    {
+      "columnNumber": 3,
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+      "functionName": "testStacktraceFiltering",
+      "language": 2,
+      "lineNumber": 3
+    },
+    {
+      "columnNumber": 3,
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+      "functionName": "foo",
+      "language": 2,
+      "lineNumber": 6
+    },
+    {
+      "columnNumber": 1,
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+      "functionName": "triggerPacket",
+      "language": 2,
+      "lineNumber": 9
+    }
+  ],
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+    "line": 3,
+    "column": 3
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.time('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159911476,
-	"type": "nullMessage",
-	"level": "log",
-	"messageText": null,
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159911476,\"type\":\"nullMessage\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159911476,
+  "type": "nullMessage",
+  "level": "log",
+  "messageText": null,
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159911476,\"type\":\"nullMessage\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.timeEnd('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159911478,
-	"type": "timeEnd",
-	"level": "log",
-	"messageText": "bar: 1.36ms",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159911478,\"type\":\"timeEnd\",\"level\":\"log\",\"messageText\":\"bar: 1.36ms\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
-		"line": 3,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159911478,
+  "type": "timeEnd",
+  "level": "log",
+  "messageText": "bar: 1.36ms",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159911478,\"type\":\"timeEnd\",\"level\":\"log\",\"messageText\":\"bar: 1.36ms\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
+    "line": 3,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.table('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159912655,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"bar"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159912655,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159912655,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "bar"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159912655,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.table(['a', 'b', 'c'])", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159913807,
-	"type": "table",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		{
-			"type": "object",
-			"actor": "server1.conn15.child1/obj31",
-			"class": "Array",
-			"extensible": true,
-			"frozen": false,
-			"sealed": false,
-			"ownPropertyLength": 4,
-			"preview": {
-				"kind": "ArrayLike",
-				"length": 3,
-				"items": [
-					"a",
-					"b",
-					"c"
-				]
-			}
-		}
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159913807,\"type\":\"table\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn15.child1/obj31\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159913807,
+  "type": "table",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    {
+      "type": "object",
+      "actor": "server1.conn15.child1/obj31",
+      "class": "Array",
+      "extensible": true,
+      "frozen": false,
+      "sealed": false,
+      "ownPropertyLength": 4,
+      "preview": {
+        "kind": "ArrayLike",
+        "length": 3,
+        "items": [
+          "a",
+          "b",
+          "c"
+        ]
+      }
+    }
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159913807,\"type\":\"table\",\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn15.child1/obj31\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.group('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159914984,
-	"type": "startGroup",
-	"level": "log",
-	"messageText": "bar",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159914984,\"type\":\"startGroup\",\"level\":\"log\",\"messageText\":\"bar\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159914984,
+  "type": "startGroup",
+  "level": "log",
+  "messageText": "bar",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159914984,\"type\":\"startGroup\",\"level\":\"log\",\"messageText\":\"bar\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.groupEnd('bar')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159914987,
-	"type": "endGroup",
-	"level": "log",
-	"messageText": null,
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159914987,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
-		"line": 3,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159914987,
+  "type": "endGroup",
+  "level": "log",
+  "messageText": null,
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159914987,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
+    "line": 3,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.groupCollapsed('foo')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159916153,
-	"type": "startGroupCollapsed",
-	"level": "log",
-	"messageText": "foo",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159916153,\"type\":\"startGroupCollapsed\",\"level\":\"log\",\"messageText\":\"foo\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159916153,
+  "type": "startGroupCollapsed",
+  "level": "log",
+  "messageText": "foo",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159916153,\"type\":\"startGroupCollapsed\",\"level\":\"log\",\"messageText\":\"foo\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.groupEnd('foo')", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159916155,
-	"type": "endGroup",
-	"level": "log",
-	"messageText": null,
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159916155,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
-		"line": 3,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159916155,
+  "type": "endGroup",
+  "level": "log",
+  "messageText": null,
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159916155,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
+    "line": 3,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.group()", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159917524,
-	"type": "startGroup",
-	"level": "log",
-	"messageText": "<no group label>",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159917524,\"type\":\"startGroup\",\"level\":\"log\",\"messageText\":\"<no group label>\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159917524,
+  "type": "startGroup",
+  "level": "log",
+  "messageText": "<no group label>",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159917524,\"type\":\"startGroup\",\"level\":\"log\",\"messageText\":\"<no group label>\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.groupEnd()", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159917526,
-	"type": "endGroup",
-	"level": "log",
-	"messageText": null,
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159917526,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
-		"line": 3,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": []
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159917526,
+  "type": "endGroup",
+  "level": "log",
+  "messageText": null,
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159917526,\"type\":\"endGroup\",\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()\",\"line\":3,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
+    "line": 3,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": []
 }));
 
 stubPreparedMessages.set("console.log(%cfoobar)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "console-api",
-	"timeStamp": 1479159919144,
-	"type": "log",
-	"level": "log",
-	"messageText": null,
-	"parameters": [
-		"foo",
-		"bar"
-	],
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159919144,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"]}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)",
-		"line": 2,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": null,
-	"userProvidedStyles": [
-		"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
-		"color:red;background:url('http://example.com/test')"
-	]
+  "id": "1",
+  "allowRepeating": true,
+  "source": "console-api",
+  "timeStamp": 1479159919144,
+  "type": "log",
+  "level": "log",
+  "messageText": null,
+  "parameters": [
+    "foo",
+    "bar"
+  ],
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"console-api\",\"timeStamp\":1479159919144,\"type\":\"log\",\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)\",\"line\":2,\"column\":1},\"groupId\":null,\"exceptionDocURL\":null,\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"]}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)",
+    "line": 2,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": null,
+  "userProvidedStyles": [
+    "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
+    "color:red;background:url('http://example.com/test')"
+  ]
 }));
 
-
 stubPackets.set("console.log('foobar', 'test')", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"foobar",
-			"test"
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159894798,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "foobar",
+      "test"
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27foobar%27%2C%20%27test%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159894798,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log(undefined)", {
-	"from": "server1.conn1.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "undefined"
-			}
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159896036,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn1.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "undefined"
+      }
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(undefined)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159896036,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.warn('danger, will robinson!')", {
-	"from": "server1.conn2.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"danger, will robinson!"
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "warn",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159897333,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn2.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "danger, will robinson!"
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.warn(%27danger%2C%20will%20robinson!%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "warn",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159897333,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log(NaN)", {
-	"from": "server1.conn3.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "NaN"
-			}
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159898667,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn3.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "NaN"
+      }
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(NaN)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159898667,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log(null)", {
-	"from": "server1.conn4.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "null"
-			}
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159900151,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn4.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "null"
+      }
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(null)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159900151,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log('鼬')", {
-	"from": "server1.conn5.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"鼬"
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159901470,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn5.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "鼬"
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%E9%BC%AC%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159901470,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.clear()", {
-	"from": "server1.conn6.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "clear",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159902721,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn6.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.clear()",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "clear",
+    "lineNumber": 1,
+    "private": false,
+    "timeStamp": 1479159902721,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.count('bar')", {
-	"from": "server1.conn7.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 27,
-		"counter": {
-			"count": 1,
-			"label": "bar"
-		},
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "count",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159903982,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn7.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 27,
+    "counter": {
+      "count": 1,
+      "label": "bar"
+    },
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.count(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "count",
+    "lineNumber": 1,
+    "private": false,
+    "timeStamp": 1479159903982,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.assert(false, {message: 'foobar'})", {
-	"from": "server1.conn8.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "object",
-				"actor": "server1.conn8.child1/obj31",
-				"class": "Object",
-				"extensible": true,
-				"frozen": false,
-				"sealed": false,
-				"ownPropertyLength": 1,
-				"preview": {
-					"kind": "Object",
-					"ownProperties": {
-						"message": {
-							"configurable": true,
-							"enumerable": true,
-							"writable": true,
-							"value": "foobar"
-						}
-					},
-					"ownPropertiesLength": 1,
-					"safeGetterValues": {}
-				}
-			}
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "assert",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159905182,
-		"timer": null,
-		"stacktrace": [
-			{
-				"columnNumber": 27,
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
-				"functionName": "triggerPacket",
-				"language": 2,
-				"lineNumber": 1
-			}
-		],
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn8.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "object",
+        "actor": "server1.conn8.child1/obj31",
+        "class": "Object",
+        "extensible": true,
+        "frozen": false,
+        "sealed": false,
+        "ownPropertyLength": 1,
+        "preview": {
+          "kind": "Object",
+          "ownProperties": {
+            "message": {
+              "configurable": true,
+              "enumerable": true,
+              "writable": true,
+              "value": "foobar"
+            }
+          },
+          "ownPropertiesLength": 1,
+          "safeGetterValues": {}
+        }
+      }
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "assert",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159905182,
+    "timer": null,
+    "stacktrace": [
+      {
+        "columnNumber": 27,
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.assert(false%2C%20%7Bmessage%3A%20%27foobar%27%7D)",
+        "functionName": "triggerPacket",
+        "language": 2,
+        "lineNumber": 1
+      }
+    ],
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log('hello \nfrom \rthe \"string world!')", {
-	"from": "server1.conn9.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"hello \nfrom \rthe \"string world!"
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159906444,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn9.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "hello \nfrom \rthe \"string world!"
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27hello%20%5Cnfrom%20%5Crthe%20%5C%22string%20world!%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159906444,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log('úṇĩçödê țĕșť')", {
-	"from": "server1.conn10.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"úṇĩçödê țĕșť"
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [],
-		"timeStamp": 1479159907704,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn10.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "úṇĩçödê țĕșť"
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%27%C3%BA%E1%B9%87%C4%A9%C3%A7%C3%B6d%C3%AA%20%C8%9B%C4%95%C8%99%C5%A5%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 1,
+    "private": false,
+    "styles": [],
+    "timeStamp": 1479159907704,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.dirxml(window)", {
-	"from": "server1.conn11.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "object",
-				"actor": "server1.conn11.child1/obj31",
-				"class": "Window",
-				"extensible": true,
-				"frozen": false,
-				"sealed": false,
-				"ownPropertyLength": 812,
-				"preview": {
-					"kind": "ObjectWithURL",
-					"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
-				}
-			}
-		],
-		"columnNumber": 27,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "dirxml",
-		"lineNumber": 1,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159908948,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn11.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "object",
+        "actor": "server1.conn11.child1/obj31",
+        "class": "Window",
+        "extensible": true,
+        "frozen": false,
+        "sealed": false,
+        "ownPropertyLength": 811,
+        "preview": {
+          "kind": "ObjectWithURL",
+          "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+        }
+      }
+    ],
+    "columnNumber": 27,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.dirxml(window)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "dirxml",
+    "lineNumber": 1,
+    "private": false,
+    "timeStamp": 1479159908948,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.trace()", {
-	"from": "server1.conn12.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [],
-		"columnNumber": 3,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-		"functionName": "testStacktraceFiltering",
-		"groupName": "",
-		"level": "trace",
-		"lineNumber": 3,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159910198,
-		"timer": null,
-		"stacktrace": [
-			{
-				"columnNumber": 3,
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-				"functionName": "testStacktraceFiltering",
-				"language": 2,
-				"lineNumber": 3
-			},
-			{
-				"columnNumber": 3,
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-				"functionName": "foo",
-				"language": 2,
-				"lineNumber": 6
-			},
-			{
-				"columnNumber": 1,
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
-				"functionName": "triggerPacket",
-				"language": 2,
-				"lineNumber": 9
-			}
-		],
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn12.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [],
+    "columnNumber": 3,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+    "functionName": "testStacktraceFiltering",
+    "groupName": "",
+    "level": "trace",
+    "lineNumber": 3,
+    "private": false,
+    "timeStamp": 1479159910198,
+    "timer": null,
+    "stacktrace": [
+      {
+        "columnNumber": 3,
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+        "functionName": "testStacktraceFiltering",
+        "language": 2,
+        "lineNumber": 3
+      },
+      {
+        "columnNumber": 3,
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+        "functionName": "foo",
+        "language": 2,
+        "lineNumber": 6
+      },
+      {
+        "columnNumber": 1,
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.trace()",
+        "functionName": "triggerPacket",
+        "language": 2,
+        "lineNumber": 9
+      }
+    ],
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.time('bar')", {
-	"from": "server1.conn13.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "time",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159911476,
-		"timer": {
-			"name": "bar",
-			"started": 1166.305
-		},
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn13.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "time",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159911476,
+    "timer": {
+      "name": "bar",
+      "started": 1166.305
+    },
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.timeEnd('bar')", {
-	"from": "server1.conn13.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "timeEnd",
-		"lineNumber": 3,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159911478,
-		"timer": {
-			"duration": 1.3550000000000182,
-			"name": "bar"
-		},
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn13.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.time(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "timeEnd",
+    "lineNumber": 3,
+    "private": false,
+    "timeStamp": 1479159911478,
+    "timer": {
+      "duration": 1.3550000000000182,
+      "name": "bar"
+    },
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.table('bar')", {
-	"from": "server1.conn14.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "table",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159912655,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn14.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "table",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159912655,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.table(['a', 'b', 'c'])", {
-	"from": "server1.conn15.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			{
-				"type": "object",
-				"actor": "server1.conn15.child1/obj31",
-				"class": "Array",
-				"extensible": true,
-				"frozen": false,
-				"sealed": false,
-				"ownPropertyLength": 4,
-				"preview": {
-					"kind": "ArrayLike",
-					"length": 3,
-					"items": [
-						"a",
-						"b",
-						"c"
-					]
-				}
-			}
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "table",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159913807,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn15.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      {
+        "type": "object",
+        "actor": "server1.conn15.child1/obj31",
+        "class": "Array",
+        "extensible": true,
+        "frozen": false,
+        "sealed": false,
+        "ownPropertyLength": 4,
+        "preview": {
+          "kind": "ArrayLike",
+          "length": 3,
+          "items": [
+            "a",
+            "b",
+            "c"
+          ]
+        }
+      }
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.table(%5B%27a%27%2C%20%27b%27%2C%20%27c%27%5D)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "table",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159913807,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.group('bar')", {
-	"from": "server1.conn16.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "bar",
-		"level": "group",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159914984,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn16.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "bar",
+    "level": "group",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159914984,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.groupEnd('bar')", {
-	"from": "server1.conn16.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
-		"functionName": "triggerPacket",
-		"groupName": "bar",
-		"level": "groupEnd",
-		"lineNumber": 3,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159914987,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn16.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group(%27bar%27)",
+    "functionName": "triggerPacket",
+    "groupName": "bar",
+    "level": "groupEnd",
+    "lineNumber": 3,
+    "private": false,
+    "timeStamp": 1479159914987,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.groupCollapsed('foo')", {
-	"from": "server1.conn17.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"foo"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
-		"functionName": "triggerPacket",
-		"groupName": "foo",
-		"level": "groupCollapsed",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159916153,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn17.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "foo"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
+    "functionName": "triggerPacket",
+    "groupName": "foo",
+    "level": "groupCollapsed",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159916153,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.groupEnd('foo')", {
-	"from": "server1.conn17.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"foo"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
-		"functionName": "triggerPacket",
-		"groupName": "foo",
-		"level": "groupEnd",
-		"lineNumber": 3,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159916155,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn17.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "foo"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.groupCollapsed(%27foo%27)",
+    "functionName": "triggerPacket",
+    "groupName": "foo",
+    "level": "groupEnd",
+    "lineNumber": 3,
+    "private": false,
+    "timeStamp": 1479159916155,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.group()", {
-	"from": "server1.conn18.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "group",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159917524,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn18.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "group",
+    "lineNumber": 2,
+    "private": false,
+    "timeStamp": 1479159917524,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.groupEnd()", {
-	"from": "server1.conn18.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "groupEnd",
-		"lineNumber": 3,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"timeStamp": 1479159917526,
-		"timer": null,
-		"workerType": "none",
-		"styles": [],
-		"category": "webdev"
-	}
+  "from": "server1.conn18.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.group()",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "groupEnd",
+    "lineNumber": 3,
+    "private": false,
+    "timeStamp": 1479159917526,
+    "timer": null,
+    "workerType": "none",
+    "styles": [],
+    "category": "webdev"
+  }
 });
 
 stubPackets.set("console.log(%cfoobar)", {
-	"from": "server1.conn19.child1/consoleActor2",
-	"type": "consoleAPICall",
-	"message": {
-		"arguments": [
-			"foo",
-			"bar"
-		],
-		"columnNumber": 1,
-		"counter": null,
-		"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)",
-		"functionName": "triggerPacket",
-		"groupName": "",
-		"level": "log",
-		"lineNumber": 2,
-		"originAttributes": {
-			"addonId": "",
-			"appId": 0,
-			"firstPartyDomain": "",
-			"inIsolatedMozBrowser": false,
-			"privateBrowsingId": 0,
-			"userContextId": 0
-		},
-		"private": false,
-		"styles": [
-			"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
-			"color:red;background:url('http://example.com/test')"
-		],
-		"timeStamp": 1479159919144,
-		"timer": null,
-		"workerType": "none",
-		"category": "webdev"
-	}
+  "from": "server1.conn19.child1/consoleActor2",
+  "type": "consoleAPICall",
+  "message": {
+    "arguments": [
+      "foo",
+      "bar"
+    ],
+    "columnNumber": 1,
+    "counter": null,
+    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=console.log(%25cfoobar)",
+    "functionName": "triggerPacket",
+    "groupName": "",
+    "level": "log",
+    "lineNumber": 2,
+    "private": false,
+    "styles": [
+      "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
+      "color:red;background:url('http://example.com/test')"
+    ],
+    "timeStamp": 1479159919144,
+    "timer": null,
+    "workerType": "none",
+    "category": "webdev"
+  }
 });
 
-
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}
\ No newline at end of file
+};
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
index e9ba38b515eb..7c10158cf916 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -7,101 +8,98 @@
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleMessage } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-
-
 stubPreparedMessages.set("Unknown property ‘such-unknown-property’.  Declaration dropped.", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "css",
-	"timeStamp": 1479159920406,
-	"type": "log",
-	"level": "warn",
-	"messageText": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"css\",\"timeStamp\":1479159920406,\"type\":\"log\",\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’.  Declaration dropped.\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property\",\"line\":3,\"column\":23},\"groupId\":null,\"userProvidedStyles\":null}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property",
-		"line": 3,
-		"column": 23
-	},
-	"groupId": null,
-	"userProvidedStyles": null
+  "id": "1",
+  "allowRepeating": true,
+  "source": "css",
+  "timeStamp": 1479159920406,
+  "type": "log",
+  "level": "warn",
+  "messageText": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"css\",\"timeStamp\":1479159920406,\"type\":\"log\",\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’.  Declaration dropped.\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property\",\"line\":3,\"column\":23},\"groupId\":null,\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property",
+    "line": 3,
+    "column": 23
+  },
+  "groupId": null,
+  "userProvidedStyles": null
 }));
 
 stubPreparedMessages.set("Error in parsing value for ‘padding-top’.  Declaration dropped.", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "css",
-	"timeStamp": 1479159920465,
-	"type": "log",
-	"level": "warn",
-	"messageText": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"css\",\"timeStamp\":1479159920465,\"type\":\"log\",\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’.  Declaration dropped.\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value\",\"line\":3,\"column\":15},\"groupId\":null,\"userProvidedStyles\":null}",
-	"stacktrace": null,
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value",
-		"line": 3,
-		"column": 15
-	},
-	"groupId": null,
-	"userProvidedStyles": null
+  "id": "1",
+  "allowRepeating": true,
+  "source": "css",
+  "timeStamp": 1479159920465,
+  "type": "log",
+  "level": "warn",
+  "messageText": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"css\",\"timeStamp\":1479159920465,\"type\":\"log\",\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’.  Declaration dropped.\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value\",\"line\":3,\"column\":15},\"groupId\":null,\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value",
+    "line": 3,
+    "column": 15
+  },
+  "groupId": null,
+  "userProvidedStyles": null
 }));
 
-
 stubPackets.set("Unknown property ‘such-unknown-property’.  Declaration dropped.", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"type": "pageError",
-	"pageError": {
-		"errorMessage": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
-		"errorMessageName": "",
-		"sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property",
-		"lineText": "  such-unknown-property: wow;",
-		"lineNumber": 3,
-		"columnNumber": 23,
-		"category": "CSS Parser",
-		"timeStamp": 1479159920406,
-		"warning": true,
-		"error": false,
-		"exception": false,
-		"strict": false,
-		"info": false,
-		"private": false,
-		"stacktrace": null
-	}
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "pageError",
+  "pageError": {
+    "errorMessage": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
+    "errorMessageName": "",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Unknown%20property",
+    "lineText": "  such-unknown-property: wow;",
+    "lineNumber": 3,
+    "columnNumber": 23,
+    "category": "CSS Parser",
+    "timeStamp": 1479159920406,
+    "warning": true,
+    "error": false,
+    "exception": false,
+    "strict": false,
+    "info": false,
+    "private": false,
+    "stacktrace": null
+  }
 });
 
 stubPackets.set("Error in parsing value for ‘padding-top’.  Declaration dropped.", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"type": "pageError",
-	"pageError": {
-		"errorMessage": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
-		"errorMessageName": "",
-		"sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value",
-		"lineText": "  padding-top: invalid value;",
-		"lineNumber": 3,
-		"columnNumber": 15,
-		"category": "CSS Parser",
-		"timeStamp": 1479159920465,
-		"warning": true,
-		"error": false,
-		"exception": false,
-		"strict": false,
-		"info": false,
-		"private": false,
-		"stacktrace": null
-	}
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "pageError",
+  "pageError": {
+    "errorMessage": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
+    "errorMessageName": "",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.css?key=Invalid%20property%20value",
+    "lineText": "  padding-top: invalid value;",
+    "lineNumber": 3,
+    "columnNumber": 15,
+    "category": "CSS Parser",
+    "timeStamp": 1479159920465,
+    "warning": true,
+    "error": false,
+    "exception": false,
+    "strict": false,
+    "info": false,
+    "private": false,
+    "stacktrace": null
+  }
 });
 
-
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}
\ No newline at end of file
+};
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
index 9973e8ca808d..731f2edc74d4 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -7,179 +8,176 @@
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleMessage } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-
-
 stubPreparedMessages.set("new Date(0)", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "javascript",
-	"timeStamp": 1479159921364,
-	"type": "result",
-	"level": "log",
-	"parameters": {
-		"type": "object",
-		"actor": "server1.conn0.child1/obj30",
-		"class": "Date",
-		"extensible": true,
-		"frozen": false,
-		"sealed": false,
-		"ownPropertyLength": 0,
-		"preview": {
-			"timestamp": 0
-		}
-	},
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921364,\"type\":\"result\",\"level\":\"log\",\"parameters\":{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Date\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"timestamp\":0}},\"repeatId\":null,\"stacktrace\":null,\"frame\":null,\"groupId\":null,\"userProvidedStyles\":null}",
-	"stacktrace": null,
-	"frame": null,
-	"groupId": null,
-	"userProvidedStyles": null
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1479159921364,
+  "type": "result",
+  "level": "log",
+  "parameters": {
+    "type": "object",
+    "actor": "server1.conn0.child1/obj30",
+    "class": "Date",
+    "extensible": true,
+    "frozen": false,
+    "sealed": false,
+    "ownPropertyLength": 0,
+    "preview": {
+      "timestamp": 0
+    }
+  },
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921364,\"type\":\"result\",\"level\":\"log\",\"parameters\":{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Date\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"timestamp\":0}},\"repeatId\":null,\"stacktrace\":null,\"frame\":null,\"groupId\":null,\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": null,
+  "groupId": null,
+  "userProvidedStyles": null
 }));
 
 stubPreparedMessages.set("asdf()", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "javascript",
-	"timeStamp": 1479159921377,
-	"type": "result",
-	"level": "error",
-	"messageText": "ReferenceError: asdf is not defined",
-	"parameters": {
-		"type": "undefined"
-	},
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921377,\"type\":\"result\",\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":{\"type\":\"undefined\"},\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":1},\"groupId\":null,\"exceptionDocURL\":\"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default\",\"userProvidedStyles\":null}",
-	"stacktrace": null,
-	"frame": {
-		"source": "debugger eval code",
-		"line": 1,
-		"column": 1
-	},
-	"groupId": null,
-	"exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-	"userProvidedStyles": null
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1479159921377,
+  "type": "result",
+  "level": "error",
+  "messageText": "ReferenceError: asdf is not defined",
+  "parameters": {
+    "type": "undefined"
+  },
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921377,\"type\":\"result\",\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":{\"type\":\"undefined\"},\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":1},\"groupId\":null,\"exceptionDocURL\":\"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default\",\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": {
+    "source": "debugger eval code",
+    "line": 1,
+    "column": 1
+  },
+  "groupId": null,
+  "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
+  "userProvidedStyles": null
 }));
 
 stubPreparedMessages.set("1 + @", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "javascript",
-	"timeStamp": 1479159921399,
-	"type": "result",
-	"level": "error",
-	"messageText": "SyntaxError: illegal character",
-	"parameters": {
-		"type": "undefined"
-	},
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921399,\"type\":\"result\",\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":{\"type\":\"undefined\"},\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"userProvidedStyles\":null}",
-	"stacktrace": null,
-	"frame": {
-		"source": "debugger eval code",
-		"line": 1,
-		"column": 4
-	},
-	"groupId": null,
-	"userProvidedStyles": null
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1479159921399,
+  "type": "result",
+  "level": "error",
+  "messageText": "SyntaxError: illegal character",
+  "parameters": {
+    "type": "undefined"
+  },
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1479159921399,\"type\":\"result\",\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":{\"type\":\"undefined\"},\"repeatId\":null,\"stacktrace\":null,\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": {
+    "source": "debugger eval code",
+    "line": 1,
+    "column": 4
+  },
+  "groupId": null,
+  "userProvidedStyles": null
 }));
 
-
 stubPackets.set("new Date(0)", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"input": "new Date(0)",
-	"result": {
-		"type": "object",
-		"actor": "server1.conn0.child1/obj30",
-		"class": "Date",
-		"extensible": true,
-		"frozen": false,
-		"sealed": false,
-		"ownPropertyLength": 0,
-		"preview": {
-			"timestamp": 0
-		}
-	},
-	"timestamp": 1479159921364,
-	"exception": null,
-	"frame": null,
-	"helperResult": null
+  "from": "server1.conn0.child1/consoleActor2",
+  "input": "new Date(0)",
+  "result": {
+    "type": "object",
+    "actor": "server1.conn0.child1/obj30",
+    "class": "Date",
+    "extensible": true,
+    "frozen": false,
+    "sealed": false,
+    "ownPropertyLength": 0,
+    "preview": {
+      "timestamp": 0
+    }
+  },
+  "timestamp": 1479159921364,
+  "exception": null,
+  "frame": null,
+  "helperResult": null
 });
 
 stubPackets.set("asdf()", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"input": "asdf()",
-	"result": {
-		"type": "undefined"
-	},
-	"timestamp": 1479159921377,
-	"exception": {
-		"type": "object",
-		"actor": "server1.conn0.child1/obj32",
-		"class": "Error",
-		"extensible": true,
-		"frozen": false,
-		"sealed": false,
-		"ownPropertyLength": 4,
-		"preview": {
-			"kind": "Error",
-			"name": "ReferenceError",
-			"message": "asdf is not defined",
-			"stack": "@debugger eval code:1:1\n",
-			"fileName": "debugger eval code",
-			"lineNumber": 1,
-			"columnNumber": 1
-		}
-	},
-	"exceptionMessage": "ReferenceError: asdf is not defined",
-	"exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-	"frame": {
-		"source": "debugger eval code",
-		"line": 1,
-		"column": 1
-	},
-	"helperResult": null
+  "from": "server1.conn0.child1/consoleActor2",
+  "input": "asdf()",
+  "result": {
+    "type": "undefined"
+  },
+  "timestamp": 1479159921377,
+  "exception": {
+    "type": "object",
+    "actor": "server1.conn0.child1/obj32",
+    "class": "Error",
+    "extensible": true,
+    "frozen": false,
+    "sealed": false,
+    "ownPropertyLength": 4,
+    "preview": {
+      "kind": "Error",
+      "name": "ReferenceError",
+      "message": "asdf is not defined",
+      "stack": "@debugger eval code:1:1\n",
+      "fileName": "debugger eval code",
+      "lineNumber": 1,
+      "columnNumber": 1
+    }
+  },
+  "exceptionMessage": "ReferenceError: asdf is not defined",
+  "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
+  "frame": {
+    "source": "debugger eval code",
+    "line": 1,
+    "column": 1
+  },
+  "helperResult": null
 });
 
 stubPackets.set("1 + @", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"input": "1 + @",
-	"result": {
-		"type": "undefined"
-	},
-	"timestamp": 1479159921399,
-	"exception": {
-		"type": "object",
-		"actor": "server1.conn0.child1/obj33",
-		"class": "Error",
-		"extensible": true,
-		"frozen": false,
-		"sealed": false,
-		"ownPropertyLength": 4,
-		"preview": {
-			"kind": "Error",
-			"name": "SyntaxError",
-			"message": "illegal character",
-			"stack": "",
-			"fileName": "debugger eval code",
-			"lineNumber": 1,
-			"columnNumber": 4
-		}
-	},
-	"exceptionMessage": "SyntaxError: illegal character",
-	"frame": {
-		"source": "debugger eval code",
-		"line": 1,
-		"column": 4
-	},
-	"helperResult": null
+  "from": "server1.conn0.child1/consoleActor2",
+  "input": "1 + @",
+  "result": {
+    "type": "undefined"
+  },
+  "timestamp": 1479159921399,
+  "exception": {
+    "type": "object",
+    "actor": "server1.conn0.child1/obj33",
+    "class": "Error",
+    "extensible": true,
+    "frozen": false,
+    "sealed": false,
+    "ownPropertyLength": 4,
+    "preview": {
+      "kind": "Error",
+      "name": "SyntaxError",
+      "message": "illegal character",
+      "stack": "",
+      "fileName": "debugger eval code",
+      "lineNumber": 1,
+      "columnNumber": 4
+    }
+  },
+  "exceptionMessage": "SyntaxError: illegal character",
+  "frame": {
+    "source": "debugger eval code",
+    "line": 1,
+    "column": 4
+  },
+  "helperResult": null
 });
 
-
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}
\ No newline at end of file
+};
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
index 9bf73e238105..71abbdff0bc3 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -7,186 +8,183 @@
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { NetworkEventMessage } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-
-
 stubPreparedMessages.set("GET request", new NetworkEventMessage({
-	"id": "1",
-	"actor": "server1.conn0.child1/netEvent29",
-	"level": "log",
-	"isXHR": false,
-	"request": {
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "GET"
-	},
-	"response": {},
-	"source": "network",
-	"type": "log",
-	"timeStamp": 1479159937660,
-	"groupId": null
+  "id": "1",
+  "actor": "server1.conn0.child1/netEvent29",
+  "level": "log",
+  "isXHR": false,
+  "request": {
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "GET"
+  },
+  "response": {},
+  "source": "network",
+  "type": "log",
+  "timeStamp": 1479159937660,
+  "groupId": null
 }));
 
 stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({
-	"id": "1",
-	"actor": "server1.conn1.child1/netEvent29",
-	"level": "log",
-	"isXHR": true,
-	"request": {
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "GET"
-	},
-	"response": {},
-	"source": "network",
-	"type": "log",
-	"timeStamp": 1479159938522,
-	"groupId": null
+  "id": "1",
+  "actor": "server1.conn1.child1/netEvent29",
+  "level": "log",
+  "isXHR": true,
+  "request": {
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "GET"
+  },
+  "response": {},
+  "source": "network",
+  "type": "log",
+  "timeStamp": 1479159938522,
+  "groupId": null
 }));
 
 stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({
-	"id": "1",
-	"actor": "server1.conn2.child1/netEvent29",
-	"level": "log",
-	"isXHR": true,
-	"request": {
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "POST"
-	},
-	"response": {},
-	"source": "network",
-	"type": "log",
-	"timeStamp": 1479159939328,
-	"groupId": null
+  "id": "1",
+  "actor": "server1.conn2.child1/netEvent29",
+  "level": "log",
+  "isXHR": true,
+  "request": {
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "POST"
+  },
+  "response": {},
+  "source": "network",
+  "type": "log",
+  "timeStamp": 1479159939328,
+  "groupId": null
 }));
 
-
 stubPackets.set("GET request", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"type": "networkEvent",
-	"eventActor": {
-		"actor": "server1.conn0.child1/netEvent29",
-		"startedDateTime": "2016-10-15T23:12:04.196Z",
-		"timeStamp": 1479159937660,
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "GET",
-		"isXHR": false,
-		"cause": {
-			"type": 3,
-			"loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-			"stacktrace": [
-				{
-					"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
-					"lineNumber": 3,
-					"columnNumber": 1,
-					"functionName": "triggerPacket",
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
-					"lineNumber": 4,
-					"columnNumber": 7,
-					"functionName": null,
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
-					"lineNumber": 53,
-					"columnNumber": 20,
-					"functionName": null,
-					"asyncCause": null
-				}
-			]
-		},
-		"private": false
-	}
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "networkEvent",
+  "eventActor": {
+    "actor": "server1.conn0.child1/netEvent29",
+    "startedDateTime": "2016-10-15T23:12:04.196Z",
+    "timeStamp": 1479159937660,
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "GET",
+    "isXHR": false,
+    "cause": {
+      "type": 3,
+      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+      "stacktrace": [
+        {
+          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
+          "lineNumber": 3,
+          "columnNumber": 1,
+          "functionName": "triggerPacket",
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
+          "lineNumber": 4,
+          "columnNumber": 7,
+          "functionName": null,
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
+          "lineNumber": 53,
+          "columnNumber": 20,
+          "functionName": null,
+          "asyncCause": null
+        }
+      ]
+    },
+    "private": false
+  }
 });
 
 stubPackets.set("XHR GET request", {
-	"from": "server1.conn1.child1/consoleActor2",
-	"type": "networkEvent",
-	"eventActor": {
-		"actor": "server1.conn1.child1/netEvent29",
-		"startedDateTime": "2016-10-15T23:12:05.690Z",
-		"timeStamp": 1479159938522,
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "GET",
-		"isXHR": true,
-		"cause": {
-			"type": 11,
-			"loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-			"stacktrace": [
-				{
-					"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
-					"lineNumber": 4,
-					"columnNumber": 1,
-					"functionName": "triggerPacket",
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
-					"lineNumber": 4,
-					"columnNumber": 7,
-					"functionName": null,
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
-					"lineNumber": 53,
-					"columnNumber": 20,
-					"functionName": null,
-					"asyncCause": null
-				}
-			]
-		},
-		"private": false
-	}
+  "from": "server1.conn1.child1/consoleActor2",
+  "type": "networkEvent",
+  "eventActor": {
+    "actor": "server1.conn1.child1/netEvent29",
+    "startedDateTime": "2016-10-15T23:12:05.690Z",
+    "timeStamp": 1479159938522,
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "GET",
+    "isXHR": true,
+    "cause": {
+      "type": 11,
+      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+      "stacktrace": [
+        {
+          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
+          "lineNumber": 4,
+          "columnNumber": 1,
+          "functionName": "triggerPacket",
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
+          "lineNumber": 4,
+          "columnNumber": 7,
+          "functionName": null,
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
+          "lineNumber": 53,
+          "columnNumber": 20,
+          "functionName": null,
+          "asyncCause": null
+        }
+      ]
+    },
+    "private": false
+  }
 });
 
 stubPackets.set("XHR POST request", {
-	"from": "server1.conn2.child1/consoleActor2",
-	"type": "networkEvent",
-	"eventActor": {
-		"actor": "server1.conn2.child1/netEvent29",
-		"startedDateTime": "2016-10-15T23:12:07.158Z",
-		"timeStamp": 1479159939328,
-		"url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
-		"method": "POST",
-		"isXHR": true,
-		"cause": {
-			"type": 11,
-			"loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-			"stacktrace": [
-				{
-					"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
-					"lineNumber": 4,
-					"columnNumber": 1,
-					"functionName": "triggerPacket",
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
-					"lineNumber": 4,
-					"columnNumber": 7,
-					"functionName": null,
-					"asyncCause": null
-				},
-				{
-					"filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
-					"lineNumber": 53,
-					"columnNumber": 20,
-					"functionName": null,
-					"asyncCause": null
-				}
-			]
-		},
-		"private": false
-	}
+  "from": "server1.conn2.child1/consoleActor2",
+  "type": "networkEvent",
+  "eventActor": {
+    "actor": "server1.conn2.child1/netEvent29",
+    "startedDateTime": "2016-10-15T23:12:07.158Z",
+    "timeStamp": 1479159939328,
+    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "method": "POST",
+    "isXHR": true,
+    "cause": {
+      "type": 11,
+      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+      "stacktrace": [
+        {
+          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js",
+          "lineNumber": 4,
+          "columnNumber": 1,
+          "functionName": "triggerPacket",
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js line 52 > eval",
+          "lineNumber": 4,
+          "columnNumber": 7,
+          "functionName": null,
+          "asyncCause": null
+        },
+        {
+          "filename": "chrome://mochikit/content/tests/BrowserTestUtils/content-task.js",
+          "lineNumber": 53,
+          "columnNumber": 20,
+          "functionName": null,
+          "asyncCause": null
+        }
+      ]
+    },
+    "private": false
+  }
 });
 
-
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}
\ No newline at end of file
+};
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
index eda8e8b83707..0b0a8293028a 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable max-len */
 
 "use strict";
 
@@ -7,96 +8,95 @@
  * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
  */
 
-const { ConsoleMessage, NetworkEventMessage } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleMessage } =
+  require("devtools/client/webconsole/new-console-output/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-
-
 stubPreparedMessages.set("ReferenceError: asdf is not defined", new ConsoleMessage({
-	"id": "1",
-	"allowRepeating": true,
-	"source": "javascript",
-	"type": "log",
-	"level": "error",
-	"messageText": "ReferenceError: asdf is not defined",
-	"parameters": null,
-	"repeat": 1,
-	"repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"type\":\"log\",\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":3,\"columnNumber\":5,\"functionName\":\"bar\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":6,\"columnNumber\":5,\"functionName\":\"foo\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":9,\"columnNumber\":3,\"functionName\":null}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"line\":3,\"column\":5},\"groupId\":null,\"exceptionDocURL\":\"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default\"}",
-	"stacktrace": [
-		{
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-			"lineNumber": 3,
-			"columnNumber": 5,
-			"functionName": "bar"
-		},
-		{
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-			"lineNumber": 6,
-			"columnNumber": 5,
-			"functionName": "foo"
-		},
-		{
-			"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-			"lineNumber": 9,
-			"columnNumber": 3,
-			"functionName": null
-		}
-	],
-	"frame": {
-		"source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-		"line": 3,
-		"column": 5
-	},
-	"groupId": null,
-	"exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default"
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1476573167137,
+  "type": "log",
+  "level": "error",
+  "messageText": "ReferenceError: asdf is not defined",
+  "parameters": null,
+  "repeat": 1,
+  "repeatId": "{\"id\":null,\"allowRepeating\":true,\"source\":\"javascript\",\"timeStamp\":1476573167137,\"type\":\"log\",\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"repeatId\":null,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":3,\"columnNumber\":5,\"functionName\":\"bar\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":6,\"columnNumber\":5,\"functionName\":\"foo\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"lineNumber\":9,\"columnNumber\":3,\"functionName\":null}],\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error\",\"line\":3,\"column\":5},\"groupId\":null,\"exceptionDocURL\":\"https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default\",\"userProvidedStyles\":null}",
+  "stacktrace": [
+    {
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+      "lineNumber": 3,
+      "columnNumber": 5,
+      "functionName": "bar"
+    },
+    {
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+      "lineNumber": 6,
+      "columnNumber": 5,
+      "functionName": "foo"
+    },
+    {
+      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+      "lineNumber": 9,
+      "columnNumber": 3,
+      "functionName": null
+    }
+  ],
+  "frame": {
+    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+    "line": 3,
+    "column": 5
+  },
+  "groupId": null,
+  "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
+  "userProvidedStyles": null
 }));
 
-
 stubPackets.set("ReferenceError: asdf is not defined", {
-	"from": "server1.conn0.child1/consoleActor2",
-	"type": "pageError",
-	"pageError": {
-		"errorMessage": "ReferenceError: asdf is not defined",
-		"errorMessageName": "JSMSG_NOT_DEFINED",
-		"exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-		"sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-		"lineText": "",
-		"lineNumber": 3,
-		"columnNumber": 5,
-		"category": "content javascript",
-		"timeStamp": 1476573167137,
-		"warning": false,
-		"error": false,
-		"exception": true,
-		"strict": false,
-		"info": false,
-		"private": false,
-		"stacktrace": [
-			{
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-				"lineNumber": 3,
-				"columnNumber": 5,
-				"functionName": "bar"
-			},
-			{
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-				"lineNumber": 6,
-				"columnNumber": 5,
-				"functionName": "foo"
-			},
-			{
-				"filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
-				"lineNumber": 9,
-				"columnNumber": 3,
-				"functionName": null
-			}
-		]
-	}
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "pageError",
+  "pageError": {
+    "errorMessage": "ReferenceError: asdf is not defined",
+    "errorMessageName": "JSMSG_NOT_DEFINED",
+    "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+    "lineText": "",
+    "lineNumber": 3,
+    "columnNumber": 5,
+    "category": "content javascript",
+    "timeStamp": 1476573167137,
+    "warning": false,
+    "error": false,
+    "exception": true,
+    "strict": false,
+    "info": false,
+    "private": false,
+    "stacktrace": [
+      {
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+        "lineNumber": 3,
+        "columnNumber": 5,
+        "functionName": "bar"
+      },
+      {
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+        "lineNumber": 6,
+        "columnNumber": 5,
+        "functionName": "foo"
+      },
+      {
+        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js?key=Reference%20Error",
+        "lineNumber": 9,
+        "columnNumber": 3,
+        "functionName": null
+      }
+    ]
+  }
 });
 
-
 module.exports = {
   stubPreparedMessages,
   stubPackets,
-}
\ No newline at end of file
+};
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
index a90ae1af1b3a..15925dee0376 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
@@ -137,34 +137,35 @@ add_task(function* () {
   is(consoleTableNodes.length, testCases.length,
     "console has the expected number of consoleTable items");
 
-  testCases.forEach((testCase, index) => {
-    info(testCase.info);
+  testCases.forEach((testCase, index) => testItem(testCase, nodes[index]));
+});
 
-    let node = nodes[index];
-    let columns = Array.from(node.querySelectorAll("thead th"));
-    let rows = Array.from(node.querySelectorAll("tbody tr"));
+function testItem(testCase, node) {
+  info(testCase.info);
 
-    is(
-      JSON.stringify(testCase.expected.columns),
-      JSON.stringify(columns.map(column => column.textContent)),
-      "table has the expected columns"
-    );
+  let columns = Array.from(node.querySelectorAll("thead th"));
+  let rows = Array.from(node.querySelectorAll("tbody tr"));
 
-    is(testCase.expected.rows.length, rows.length,
-      "table has the expected number of rows");
+  is(
+    JSON.stringify(testCase.expected.columns),
+    JSON.stringify(columns.map(column => column.textContent)),
+    "table has the expected columns"
+  );
 
-    testCase.expected.rows.forEach((expectedRow, rowIndex) => {
-      let row = rows[rowIndex];
-      let cells = row.querySelectorAll("td");
-      is(expectedRow.length, cells.length, "row has the expected number of cells");
+  is(testCase.expected.rows.length, rows.length,
+    "table has the expected number of rows");
 
-      expectedRow.forEach((expectedCell, cellIndex) => {
-        let cell = cells[cellIndex];
-        is(expectedCell, cell.textContent, "cell has the expected content");
-      });
+  testCase.expected.rows.forEach((expectedRow, rowIndex) => {
+    let row = rows[rowIndex];
+    let cells = row.querySelectorAll("td");
+    is(expectedRow.length, cells.length, "row has the expected number of cells");
+
+    expectedRow.forEach((expectedCell, cellIndex) => {
+      let cell = cells[cellIndex];
+      is(expectedCell, cell.textContent, "cell has the expected content");
     });
   });
-});
+}
 
 function findConsoleTable(node, index) {
   let condition = node.querySelector(
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
index 4280270dd0b2..25310daffef0 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
@@ -19,15 +19,15 @@ add_task(function* () {
   let receievedMessages = waitForMessages({
     hud,
     messages: [{
-      text: '0',
+      text: "0",
     }, {
-      text: '1',
+      text: "1",
     }, {
-      text: '2',
+      text: "2",
     }],
   });
 
-  yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
+  yield ContentTask.spawn(gBrowser.selectedBrowser, {}, function () {
     content.wrappedJSObject.doLogs(3);
   });
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js
index 5225a6ac17a4..54d0f95af0ad 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js
@@ -21,6 +21,8 @@ add_task(function* () {
 });
 
 function setupObserver() {
+  const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
+
   const observer = {
     QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
@@ -34,7 +36,8 @@ function setupObserver() {
           created = true;
           break;
         case "web-console-destroyed":
-          ok(!HUDService.getHudReferenceById(subject.data), "We do not have a hud reference");
+          ok(!HUDService.getHudReferenceById(subject.data),
+            "We do not have a hud reference");
           Services.obs.removeObserver(observer, "web-console-destroyed");
           destroyed = true;
           break;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
index b71eaec4f13e..6d04b7bb6774 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -3,6 +3,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* import-globals-from ../../../../framework/test/shared-head.js */
+/* exported WCUL10n, openNewTabAndConsole, waitForMessages, waitFor, findMessage */
 
 "use strict";
 
@@ -50,34 +51,38 @@ var openNewTabAndConsole = Task.async(function* (url) {
  *
  * @param object options
  *        - hud: the webconsole
- *        - messages: Array[Object]. An array of messages to match. Current supported options:
+ *        - messages: Array[Object]. An array of messages to match.
+            Current supported options:
  *            - text: Exact text match in .message-body
  */
 function waitForMessages({ hud, messages }) {
   return new Promise(resolve => {
     let numMatched = 0;
-    let receivedLog = hud.ui.on("new-messages", function messagesReceieved(e, newMessages) {
-      for (let message of messages) {
-        if (message.matched) {
-          continue;
-        }
+    let receivedLog = hud.ui.on("new-messages",
+      function messagesReceieved(e, newMessages) {
+        for (let message of messages) {
+          if (message.matched) {
+            continue;
+          }
 
-        for (let newMessage of newMessages) {
-          if (newMessage.node.querySelector(".message-body").textContent == message.text) {
-            numMatched++;
-            message.matched = true;
-            info("Matched a message with text: " + message.text + ", still waiting for " + (messages.length - numMatched) + " messages");
-            break;
+          for (let newMessage of newMessages) {
+            let messageBody = newMessage.node.querySelector(".message-body");
+            if (messageBody.textContent == message.text) {
+              numMatched++;
+              message.matched = true;
+              info("Matched a message with text: " + message.text +
+                ", still waiting for " + (messages.length - numMatched) + " messages");
+              break;
+            }
+          }
+
+          if (numMatched === messages.length) {
+            hud.ui.off("new-messages", messagesReceieved);
+            resolve(receivedLog);
+            return;
           }
         }
-
-        if (numMatched === messages.length) {
-          hud.ui.off("new-messages", messagesReceieved);
-          resolve(receivedLog);
-          return;
-        }
-      }
-    });
+      });
   });
 }
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html
index 9d122387a2fb..8d5c9e1244b9 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html
@@ -7,6 +7,7 @@
   <body>
     <p>batch console calls test page</p>
     <script>
+    /* exported batchLog, batchLogAndClear */
     "use strict";
 
     function batchLog(numMessages = 0) {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
index 293421549505..f07ed2a4552c 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
@@ -7,6 +7,8 @@
   <body>
     <p>Webconsole filters test page</p>
     <script>
+      "use strict";
+
       console.log("console log");
       console.warn("console warn");
       console.error("console error");
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html
index 47373d3b921e..f4f1f21b66fc 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html
@@ -7,21 +7,22 @@
   <body>
     <p>console.group() & console.groupCollapsed() test page</p>
     <script>
+    /* exported doLog */
     "use strict";
 
     function doLog() {
-        console.group("group-1");
-        console.log("log-1");
-        console.group("group-2");
-        console.log("log-2");
-        console.groupEnd("group-2");
-        console.log("log-3");
-        console.groupEnd("group-1");
-        console.log("log-4");
-        console.groupCollapsed("group-3");
-        console.log("log-5");
-        console.groupEnd("group-3");
-        console.log("log-6");
+      console.group("group-1");
+      console.log("log-1");
+      console.group("group-2");
+      console.log("log-2");
+      console.groupEnd("group-2");
+      console.log("log-3");
+      console.groupEnd("group-1");
+      console.log("log-4");
+      console.groupCollapsed("group-3");
+      console.log("log-5");
+      console.groupEnd("group-3");
+      console.log("log-6");
     }
     </script>
   </body>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html
index b7666e50b001..88e9a4c07a54 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html
@@ -7,6 +7,9 @@
   <body>
     <p>console.table() test page</p>
     <script>
+      /* exported doConsoleTable */
+      "use strict";
+
       function doConsoleTable(data, constrainedHeaders = null) {
         if (constrainedHeaders) {
           console.table(data, constrainedHeaders);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html
index 7ef09d9a10d6..b7f358570ac5 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html
@@ -7,9 +7,12 @@
   <body>
     <p>Simple webconsole test page</p>
     <script>
+      /* exported doLogs */
+      "use strict";
+
       function doLogs(num) {
         num = num || 1;
-        for (var i = 0; i < num; i++) {
+        for (let i = 0; i < num; i++) {
           console.log(i);
         }
       }
diff --git a/devtools/client/webconsole/new-console-output/test/require-helper.js b/devtools/client/webconsole/new-console-output/test/require-helper.js
index 59fae0bd9075..5d9a380aba51 100644
--- a/devtools/client/webconsole/new-console-output/test/require-helper.js
+++ b/devtools/client/webconsole/new-console-output/test/require-helper.js
@@ -39,4 +39,5 @@ requireHacker.global_hook("default", path => {
     case "devtools/shared/client/main":
       return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/ObjectClient")`;
   }
+  return undefined;
 });