From 1a56460275855d4d6ba5eddcec5e54be460f8927 Mon Sep 17 00:00:00 2001
From: Robert Bartlensky <rbartlensky@mozilla.com>
Date: Fri, 6 Jul 2018 17:37:16 +0100
Subject: [PATCH 01/29] Bug 1473951: Add infer to taskcluster and build. r=gps

MozReview-Commit-ID: BHi3E6J3nuH

--HG--
extra : rebase_source : a59180efe4fed56222d2847d60133739f38c8ca8
---
 .flake8                                       |   1 +
 build/build-infer/README                      |  36 ++++++
 build/build-infer/build-infer.py              | 116 ++++++++++++++++++
 build/build-infer/infer-linux64.json          |   5 +
 taskcluster/ci/docker-image/kind.yml          |   3 +
 .../ci/static-analysis-autotest/kind.yml      |   1 +
 taskcluster/ci/toolchain/linux.yml            |  22 ++++
 taskcluster/docker/infer-build/Dockerfile     |  30 +++++
 taskcluster/scripts/misc/build-infer-linux.sh |  22 ++++
 9 files changed, 236 insertions(+)
 create mode 100644 build/build-infer/README
 create mode 100755 build/build-infer/build-infer.py
 create mode 100644 build/build-infer/infer-linux64.json
 create mode 100644 taskcluster/docker/infer-build/Dockerfile
 create mode 100755 taskcluster/scripts/misc/build-infer-linux.sh

diff --git a/.flake8 b/.flake8
index 9676dac2658f..2ef78e1d5a37 100644
--- a/.flake8
+++ b/.flake8
@@ -21,3 +21,4 @@ exclude =
     security/nss/,
     testing/mochitest/pywebsocket,
     tools/lint/test/files,
+    build/build-infer/build-infer.py,
diff --git a/build/build-infer/README b/build/build-infer/README
new file mode 100644
index 000000000000..af11d9af3c54
--- /dev/null
+++ b/build/build-infer/README
@@ -0,0 +1,36 @@
+build-infer.py
+==============
+
+A script to build infer from source.
+
+```
+usage: build-infer.py [-h] -c CONFIG [--clean]
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -c CONFIG, --config CONFIG
+                        infer configuration file
+  --clean               Clean the build directory
+```
+
+Pre-requisites
+--------------
+* Working build toolchain.
+* ocam
+* git
+* autoconf
+* libsqlite-dev
+* CMake
+* Ninja
+* Python 2.7
+
+Please use the latest available CMake for your platform to avoid surprises.
+
+Config file format
+------------------
+
+build-clang.py accepts a JSON config format with the following fields:
+
+* infer_revision: The infer revision to build.
+* infer_repo: git repository for infer.
+* patches: Optional list of patches to apply.
\ No newline at end of file
diff --git a/build/build-infer/build-infer.py b/build/build-infer/build-infer.py
new file mode 100755
index 000000000000..cf3e1d501e71
--- /dev/null
+++ b/build/build-infer/build-infer.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import subprocess
+import json
+import argparse
+import sys
+import shutil
+from functools import reduce
+
+
+def check_run(args, path):
+    print(' '.join(args) + ' in ' + path, file=sys.stderr)
+    subprocess.run(args, cwd=path, check=True)
+
+
+def run_in(path, args, extra_env=None):
+    '''
+    Runs the given commands in the directory specified by <path>.
+    '''
+    env = dict(os.environ)
+    env.update(extra_env or {})
+    check_run(args, path)
+    subprocess.run(args, cwd=path)
+
+
+def build_tar_package(tar, name, base, directory):
+    name = os.path.realpath(name)
+    run_in(base, [tar,
+                  '-c',
+                  '-%s' % ('J' if '.xz' in name else 'j'),
+                  '-f',
+                  name, directory])
+
+
+def is_git_repo(dir):
+    '''Check whether the given directory is a git repository.'''
+    from subprocess import CalledProcessError
+    try:
+        check_run(['git', 'rev-parse'], dir)
+        return True
+    except CalledProcessError:
+        return False
+
+
+def git_clone(main_dir, url, clone_dir, commit):
+    '''
+    Clones the repository from <url> into <clone_dir>, and brings the
+    repository to the state of <commit>.
+    '''
+    run_in(main_dir, ['git', 'clone', url, clone_dir])
+    run_in(clone_dir, ['git', 'checkout', commit])
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-c', '--config', required=True,
+                        type=argparse.FileType('r'),
+                        help='Infer configuration file')
+    parser.add_argument('-b', '--base-dir',
+                        help="Base directory for code and build artifacts")
+    parser.add_argument('--clean', action='store_true',
+                        help='Clean the build directory')
+    parser.add_argument('--skip-tar', action='store_true',
+                        help='Skip tar packaging stage')
+
+    args = parser.parse_args()
+
+    # The directories end up in the debug info, so the easy way of getting
+    # a reproducible build is to run it in a know absolute directory.
+    # We use a directory that is registered as a volume in the Docker image.
+    if args.base_dir:
+        base_dir = args.base_dir
+    else:
+        base_dir = reduce(os.path.join,
+                          [os.sep + 'builds', 'worker',
+                           'workspace', 'moz-toolchain'])
+    infer_dir = os.path.join(base_dir, 'infer')
+    source_dir = os.path.join(infer_dir, 'src')
+    build_dir = os.path.join(infer_dir, 'build')
+
+    if args.clean:
+        shutil.rmtree(build_dir)
+        os.sys.exit(0)
+
+    config = json.load(args.config)
+    infer_revision = config['infer_revision']
+    infer_repo = config['infer_repo']
+
+    for folder in [infer_dir, source_dir, build_dir]:
+        os.makedirs(folder, exist_ok=True)
+
+    # clone infer
+    if not is_git_repo(source_dir):
+        # git doesn't like cloning into a non-empty folder. If src is not a git
+        # repo then just remove it in order to reclone
+        shutil.rmtree(source_dir)
+        git_clone(infer_dir, infer_repo, source_dir, infer_revision)
+    # apply a few patches
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    # clean the git directory by reseting all changes
+    git_commands = [['clean', '-f'], ['reset', '--hard']]
+    for command in git_commands:
+        run_in(source_dir, ['git']+command)
+    for p in config.get('patches', []):
+        run_in(source_dir, ['git', 'apply', os.path.join(dir_path, p)])
+    # build infer
+    run_in(source_dir, ['./build-infer.sh', 'java'],
+           extra_env={'NO_CMAKE_STRIP': '1'})
+    package_name = 'infer'
+    if not args.skip_tar:
+        build_tar_package('tar', '%s.tar.xz' % (package_name),
+                          source_dir, os.path.join('infer', 'bin'))
diff --git a/build/build-infer/infer-linux64.json b/build/build-infer/infer-linux64.json
new file mode 100644
index 000000000000..5b5e51ef3b16
--- /dev/null
+++ b/build/build-infer/infer-linux64.json
@@ -0,0 +1,5 @@
+{
+    "infer_repo": "https://github.com/facebook/infer",
+    "infer_revision": "14aa1edbf532675f48ba0a35a2e55d07b79b1f3c",
+    "patches": []
+}
diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
index ba0919ed6c1c..253c5fdc7790 100644
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -86,6 +86,9 @@ jobs:
   fetch:
     symbol: I(fetch)
     parent: debian9-base
+  infer-build:
+    symbol: I(infer)
+    parent: debian9-base
   mingw32-build:
     symbol: I(mingw)
     parent: debian9-base
diff --git a/taskcluster/ci/static-analysis-autotest/kind.yml b/taskcluster/ci/static-analysis-autotest/kind.yml
index acc42d0af601..c5540dcd9693 100644
--- a/taskcluster/ci/static-analysis-autotest/kind.yml
+++ b/taskcluster/ci/static-analysis-autotest/kind.yml
@@ -48,6 +48,7 @@ jobs:
         toolchains:
             - linux64-clang
             - linux64-clang-tidy
+            - linux64-infer
             - linux64-rust
             - linux64-sccache
 
diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index 0887d4ff5d52..41136474e389 100755
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -125,6 +125,28 @@ linux64-clang-tidy:
     toolchains:
         - linux64-gcc-4.9
 
+linux64-infer:
+    description: "infer build"
+    index:
+        product: static-analysis
+        job-name: linux64-infer
+    treeherder:
+        kind: build
+        platform: toolchains/opt
+        symbol: TL(infer)
+        tier: 1
+    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: infer-build}
+        max-run-time: 3600
+    run:
+        using: toolchain-script
+        script: build-infer-linux.sh
+        resources:
+            - 'build/build-infer/build-infer.py'
+            - 'build/build-infer/infer-linux64.json'
+        toolchain-artifact: public/build/infer.tar.xz
+
 linux64-gcc-4.9:
     description: "GCC 4.9 toolchain build"
     treeherder:
diff --git a/taskcluster/docker/infer-build/Dockerfile b/taskcluster/docker/infer-build/Dockerfile
new file mode 100644
index 000000000000..84d46433f4d0
--- /dev/null
+++ b/taskcluster/docker/infer-build/Dockerfile
@@ -0,0 +1,30 @@
+# %ARG DOCKER_IMAGE_PARENT
+FROM $DOCKER_IMAGE_PARENT
+MAINTAINER Mike Hommey <mhommey@mozilla.com>
+
+VOLUME /builds/worker/checkouts
+VOLUME /builds/worker/workspace
+VOLUME /builds/worker/tooltool-cache
+
+ENV XZ_OPT=-T0
+
+RUN apt-get update && \
+    apt-get install \
+      autoconf \
+      bison \
+      bzip2 \
+      flex \
+      curl \
+      git \
+      opam \
+      libsqlite3-dev \
+      autoconf \
+      automake \
+      cmake \
+      libc6-dev \
+      openjdk-8-jdk-headless \
+      pkg-config \
+      patch \
+      tar \
+      unzip \
+      zlib1g-dev
diff --git a/taskcluster/scripts/misc/build-infer-linux.sh b/taskcluster/scripts/misc/build-infer-linux.sh
new file mode 100755
index 000000000000..c42a925cbadf
--- /dev/null
+++ b/taskcluster/scripts/misc/build-infer-linux.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -x -e -v
+
+# This script is for building infer for Linux.
+
+WORKSPACE=$HOME/workspace
+HOME_DIR=$WORKSPACE/build
+UPLOAD_DIR=$HOME/artifacts
+
+cd $HOME_DIR/src
+
+# gets a bit too verbose here
+set +x
+
+cd build/build-infer
+./build-infer.py -c infer-linux64.json
+
+set -x
+
+# Put a tarball in the artifacts dir
+mkdir -p $UPLOAD_DIR
+cp infer.tar.* $UPLOAD_DIR

From 86dd2d64bf34915f543cfc07577dad50c80105d7 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Thu, 26 Jul 2018 15:18:08 +0200
Subject: [PATCH 02/29] Bug 1476605 - Fix Error rep failure when stacktrace is
 a longString; r=sole.

The actual fix for this issue will come in a future
reps bundle when https://github.com/devtools-html/debugger.html/pull/6705
gets merged.
But, I do want this change to be uplifted to release, and it should be
easier to only apply this simple change than the whole next release
which would contain unrelated code changes.
Also, this patch introduces a test to make sure we don't ever regress
this.

MozReview-Commit-ID: 3QPrx3TLln0

--HG--
extra : rebase_source : 9a62da36af01506e9290d059a2aa3a4a7c8bc75f
---
 .../client/shared/components/reps/reps.js     |  2 +-
 .../webconsole/test/mochitest/browser.ini     |  1 +
 ..._webconsole_error_with_longstring_stack.js | 29 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js

diff --git a/devtools/client/shared/components/reps/reps.js b/devtools/client/shared/components/reps/reps.js
index a6bca5769c31..3509a39dc170 100644
--- a/devtools/client/shared/components/reps/reps.js
+++ b/devtools/client/shared/components/reps/reps.js
@@ -1978,7 +1978,7 @@ function getStacktraceElements(props, preview) {
     // Result:
     // ["scriptLocation:2:100", "scriptLocation", "2", "100"]
     const locationParts = location.match(/^(.*):(\d+):(\d+)$/);
-    if (props.onViewSourceInDebugger && location && !IGNORED_SOURCE_URLS.includes(locationParts[1]) && locationParts) {
+    if (props.onViewSourceInDebugger && location && locationParts && !IGNORED_SOURCE_URLS.includes(locationParts[1])) {
       const [, url, line, column] = locationParts;
       onLocationClick = e => {
         // Don't trigger ObjectInspector expand/collapse.
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
index c9228ef84403..455f07374787 100644
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -276,6 +276,7 @@ subsuite = clipboard
 [browser_webconsole_cspro.js]
 [browser_webconsole_document_focus.js]
 [browser_webconsole_duplicate_errors.js]
+[browser_webconsole_error_with_longstring_stack.js]
 [browser_webconsole_error_with_unicode.js]
 [browser_webconsole_errors_after_page_reload.js]
 [browser_webconsole_eval_in_debugger_stackframe.js]
diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js
new file mode 100644
index 000000000000..1222e261d87e
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js
@@ -0,0 +1,29 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Check if an error with a longString stack is displayed as expected.
+
+"use strict";
+
+const MESSAGE = "Error with longString stack";
+const TEST_URI = `data:text/html;charset=utf8,<script>
+  const x = new Error("longString stack");
+  x.stack = "s@http://exampl.com:1:1\\n".repeat(1000);
+  console.log("${MESSAGE}", x);
+</script>`;
+
+add_task(async function() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+
+  info("Wait for the error to be logged");
+  const msgNode = await waitFor(() => findMessage(hud, MESSAGE));
+  ok(msgNode, `Error logged`);
+
+  const errorNode = msgNode.querySelector(".objectBox-stackTrace");
+  ok(errorNode, "The error object is logged as expected");
+  ok(errorNode.textContent.includes("longString stack"));
+  ok(errorNode.querySelectorAll(".objectBox-stackTrace-fn").length > 0,
+    "Frames functions are displayed");
+  ok(errorNode.querySelectorAll(".objectBox-stackTrace-location").length > 0,
+    "Frames location are displayed");
+});

From 417af36aff345490638c513c490d14d69f05473c Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Tue, 24 Jul 2018 14:41:50 +0200
Subject: [PATCH 03/29] Bug 1470922 - Make sure jsterm tests run in both old
 and new jsterm; r=bgrins.

Since codeMirror jsterm is becoming the default, we explicitely
set the pref to false before each jsterm test so they run with
the 2 version of the component.

MozReview-Commit-ID: 2qxIcRlIS9M

--HG--
extra : rebase_source : 025dcf3ee32969db87621f6c92e284a21e2a51e2
---
 devtools/client/webconsole/test/mocha-test-setup.js             | 2 +-
 .../mochitest/browser_jsterm_add_edited_input_to_history.js     | 1 +
 ...sterm_autocomplete-properties-with-non-alphanumeric-names.js | 1 +
 .../mochitest/browser_jsterm_autocomplete_array_no_index.js     | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_arrow_keys.js    | 1 +
 .../mochitest/browser_jsterm_autocomplete_cached_results.js     | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_commands.js      | 1 +
 .../mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_escape_key.js    | 1 +
 .../browser_jsterm_autocomplete_extraneous_closing_brackets.js  | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_helpers.js       | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js | 1 +
 .../browser_jsterm_autocomplete_in_debugger_stackframe.js       | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_inside_text.js   | 1 +
 .../mochitest/browser_jsterm_autocomplete_native_getters.js     | 1 +
 .../mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js    | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_paste_undo.js    | 1 +
 .../test/mochitest/browser_jsterm_autocomplete_return_key.js    | 1 +
 .../browser_jsterm_autocomplete_return_key_no_selection.js      | 1 +
 .../webconsole/test/mochitest/browser_jsterm_completion.js      | 1 +
 .../test/mochitest/browser_jsterm_content_defined_helpers.js    | 1 +
 .../webconsole/test/mochitest/browser_jsterm_copy_command.js    | 1 +
 .../test/mochitest/browser_jsterm_ctrl_a_select_all.js          | 1 +
 .../webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js    | 1 +
 .../test/mochitest/browser_jsterm_document_no_xray.js           | 1 +
 .../webconsole/test/mochitest/browser_jsterm_error_docs.js      | 1 +
 .../test/mochitest/browser_jsterm_error_outside_valid_range.js  | 1 +
 .../webconsole/test/mochitest/browser_jsterm_helper_clear.js    | 1 +
 .../webconsole/test/mochitest/browser_jsterm_helper_dollar.js   | 1 +
 .../test/mochitest/browser_jsterm_helper_dollar_dollar.js       | 1 +
 .../webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js | 1 +
 .../webconsole/test/mochitest/browser_jsterm_helper_help.js     | 1 +
 .../test/mochitest/browser_jsterm_helper_keys_values.js         | 1 +
 .../webconsole/test/mochitest/browser_jsterm_helper_pprint.js   | 1 +
 .../browser_jsterm_hide_when_devtools_chrome_enabled_false.js   | 1 +
 .../client/webconsole/test/mochitest/browser_jsterm_history.js  | 1 +
 .../test/mochitest/browser_jsterm_history_arrow_keys.js         | 1 +
 .../webconsole/test/mochitest/browser_jsterm_history_nav.js     | 1 +
 .../webconsole/test/mochitest/browser_jsterm_history_persist.js | 1 +
 .../webconsole/test/mochitest/browser_jsterm_input_expansion.js | 1 +
 .../client/webconsole/test/mochitest/browser_jsterm_inspect.js  | 1 +
 .../webconsole/test/mochitest/browser_jsterm_instance_of.js     | 1 +
 .../webconsole/test/mochitest/browser_jsterm_multiline.js       | 1 +
 .../browser_jsterm_no_autocompletion_on_defined_variables.js    | 1 +
 .../mochitest/browser_jsterm_no_input_and_tab_key_pressed.js    | 1 +
 .../webconsole/test/mochitest/browser_jsterm_null_undefined.js  | 1 +
 .../test/mochitest/browser_jsterm_popup_close_on_tab_switch.js  | 1 +
 .../mochitest/browser_jsterm_screenshot_command_clipboard.js    | 1 +
 .../test/mochitest/browser_jsterm_screenshot_command_file.js    | 1 +
 .../client/webconsole/test/mochitest/browser_jsterm_selfxss.js  | 1 +
 50 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/devtools/client/webconsole/test/mocha-test-setup.js b/devtools/client/webconsole/test/mocha-test-setup.js
index 890f51d2c8a0..a90fcaf15928 100644
--- a/devtools/client/webconsole/test/mocha-test-setup.js
+++ b/devtools/client/webconsole/test/mocha-test-setup.js
@@ -24,7 +24,7 @@ pref("devtools.webconsole.inputHistoryCount", 50);
 pref("devtools.webconsole.persistlog", false);
 pref("devtools.webconsole.timestampMessages", false);
 pref("devtools.webconsole.sidebarToggle", true);
-pref("devtools.webconsole.jsterm.codeMirror", false);
+pref("devtools.webconsole.jsterm.codeMirror", true);
 
 global.loader = {
   lazyServiceGetter: () => {},
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
index f49a3cdcfef0..97185424411a 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
@@ -13,6 +13,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 817834";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
index e501514e0257..7051a1504a35 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,test autocompletion with $ or _";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
index a2068612dcf5..d99d367a26f4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
@@ -17,6 +17,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
index 8245a2e525c4..76a3ea93e5c4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
@@ -17,6 +17,7 @@ const TEST_URI = `data:text/html;charset=utf-8,<head><script>
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
index 3472bdab5c47..b9462d2e08fc 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
@@ -12,6 +12,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test cached autocompletion resu
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
index 1631de274d5c..1b668cc59d52 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
@@ -9,6 +9,7 @@ const TEST_URI = `data:text/html;charset=utf-8,Test command autocomplete`;
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
index 452483ea1521..df34c3693624 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -11,6 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
index 3cf96df5f1ef..7de7e2ce4897 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
@@ -24,6 +24,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
index 324a43d204e8..8559c264d142 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
@@ -12,6 +12,7 @@ const TEST_URI = "data:text/html;charset=utf-8,test for bug 592442";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
index b6b0881c0a34..dffdcc6c12eb 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
@@ -12,6 +12,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test JSTerm Helpers autocomplet
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
index 8a05f3d80c07..bba0630b999c 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
@@ -9,6 +9,7 @@
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
index dfdd72dd0fa5..1c253b285e83 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
@@ -13,6 +13,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
index 1fdaf2947a5e..e433ce17d9bb 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
@@ -18,6 +18,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
index 9a48dd13ac7e..48dd2d42d1dd 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
@@ -12,6 +12,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Test document.body autocompletion
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
index 6aecf7373afa..b621b98d882e 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
@@ -26,6 +26,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
index db0942eb4339..461a70376ad3 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
@@ -17,6 +17,7 @@ const stringToCopy = "foobazbarBug642615";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
index 68acfb055966..ed8026c62c65 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
@@ -26,6 +26,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
index f7542f96abdf..037bddd29d17 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
@@ -22,6 +22,7 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
index d792b0c39700..85a2fe70bbea 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test code completion";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
index b83fab06bb18..587b06bdbeec 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
@@ -38,6 +38,7 @@ const TEST_URI = `data:text/html,<meta charset=utf8>
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
index 6631d7b7442f..54bbb3bfe017 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
@@ -28,6 +28,7 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
index 7f4b44dda65d..ba167bdb1956 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Test console select all";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
index 08695a280c3a..badef246af74 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
@@ -16,6 +16,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
index 53bab50ceb8b..43839176d3fe 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
@@ -7,6 +7,7 @@ const TEST_URI = "data:text/html,Test evaluating document";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
index b6688338ef83..71b6ddd1cb4a 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
@@ -7,6 +7,7 @@ const TEST_URI = "data:text/html,Test error documentation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
index 514ba7cc5967..22988360ec27 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
@@ -10,6 +10,7 @@ const TEST_URI = "data:text/html,Test error documentation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
index b41c77a960fe..14dd716261b4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
@@ -7,6 +7,7 @@ const TEST_URI = "data:text/html,Test <code>clear()</code> jsterm helper";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
index a03775a56be4..dba6f86b062a 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
@@ -17,6 +17,7 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
index 60be802e15cc..1c05d5ec17e9 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
@@ -17,6 +17,7 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
index 1b0a603b62ef..229025f6f66d 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
@@ -17,6 +17,7 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
index f36bee2d9166..87ee4e3cfb33 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
@@ -8,6 +8,7 @@ const HELP_URL = "https://developer.mozilla.org/docs/Tools/Web_Console/Helpers";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
index 09345ef7a764..3ea9dbe16697 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
@@ -8,6 +8,7 @@ const TEST_URI =
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
index ce53921b9ae3..39846e2553c4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
@@ -7,6 +7,7 @@ const TEST_URI = "data:text/html,Test <code>pprint()</code> jsterm helper";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
index ac68ba67c658..31b20930163f 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
@@ -24,6 +24,7 @@
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
index c2b3404d8df2..ba332203ec46 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
@@ -17,6 +17,7 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
index 9fbcae9cf69c..4e093c6c54e3 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
@@ -20,6 +20,7 @@ const TEST_VALUES = [
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
index b6f61600d334..218ccd3706fa 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
@@ -13,6 +13,7 @@ const TEST_URI = "data:text/html;charset=utf-8,<p>bug 660806 - history " +
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
index 6f6f91fa093d..4deeba7ac690 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
@@ -19,6 +19,7 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
index e71689533c33..8767f8c8e17c 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Test for jsterm multine input";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
index d188fd5d9cd3..68a4a0f5936f 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test inspect() command";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
index 73a1db561054..b7b799b8f4ef 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
@@ -8,6 +8,7 @@ const TEST_URI = "data:text/html,Test <code>instanceof</code> evaluation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
index 81c6d46d476d..92eaf760e646 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
@@ -77,6 +77,7 @@ const DATA = [
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
index 269c90b62470..2a8093829fd2 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
@@ -12,6 +12,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
index 994ac1dc3481..d2f561d0d250 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
@@ -11,6 +11,7 @@ const TEST_URI = "data:text/html,Testing jsterm with no input";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
index 24767bcfa684..580fbc5e5788 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
@@ -8,6 +8,7 @@ const TEST_URI =
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
index 6906bca35d65..e7f0c279ed97 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
@@ -13,6 +13,7 @@ const TEST_URI_NAVIGATE = "data:text/html;charset=utf-8,<p>testing autocomplete
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
index e96e49d1b967..6bbc2513593d 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
@@ -14,6 +14,7 @@ const dpr = "--dpr 1";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
index 5074ba5be8fe..b2f6295150e6 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
@@ -15,6 +15,7 @@ const dpr = "--dpr 1";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
index 4b3121e38157..fa0a7b4f66b5 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
@@ -18,6 +18,7 @@ const stringToCopy = "EvilCommand";
 
 add_task(async function() {
   // Run test with legacy JsTerm
+  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTest();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);

From ed14a440a574a7909a682d6e113409fc3d9b5a9c Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Tue, 24 Jul 2018 10:48:01 +0200
Subject: [PATCH 04/29] Bug 1470922 - Enable CodeMirror JSTerm on Nightly
 except for people using accessible technology; r=bgrins.

MozReview-Commit-ID: 5wpd9o4w9H0

--HG--
extra : rebase_source : 5e842e6ccb6a133efde047cc345286f5e0d69b76
---
 devtools/client/preferences/devtools-client.js          | 6 +++++-
 devtools/client/webconsole/webconsole-output-wrapper.js | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/devtools/client/preferences/devtools-client.js b/devtools/client/preferences/devtools-client.js
index 1a9d38996c75..e267993eaeeb 100644
--- a/devtools/client/preferences/devtools-client.js
+++ b/devtools/client/preferences/devtools-client.js
@@ -279,8 +279,12 @@ pref("devtools.webconsole.sidebarToggle", true);
 pref("devtools.webconsole.sidebarToggle", false);
 #endif
 
-// Enable CodeMirror in the JsTerm: |false|
+// Enable CodeMirror in the JsTerm in Nightly builds
+#if defined(NIGHTLY_BUILD)
+pref("devtools.webconsole.jsterm.codeMirror", true);
+#else
 pref("devtools.webconsole.jsterm.codeMirror", false);
+#endif
 
 // Disable the new performance recording panel by default
 pref("devtools.performance.new-panel-enabled", false);
diff --git a/devtools/client/webconsole/webconsole-output-wrapper.js b/devtools/client/webconsole/webconsole-output-wrapper.js
index 935e828d2460..08679dcc33a3 100644
--- a/devtools/client/webconsole/webconsole-output-wrapper.js
+++ b/devtools/client/webconsole/webconsole-output-wrapper.js
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const Services = require("Services");
 const { createElement, createFactory } = require("devtools/client/shared/vendor/react");
 const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { Provider } = require("devtools/client/shared/vendor/react-redux");
@@ -245,7 +246,8 @@ WebConsoleOutputWrapper.prototype = {
         hud,
         onFirstMeaningfulPaint: resolve,
         closeSplitConsole: this.closeSplitConsole.bind(this),
-        jstermCodeMirror: store.getState().prefs.jstermCodeMirror,
+        jstermCodeMirror: store.getState().prefs.jstermCodeMirror
+          && !Services.appinfo.accessibilityEnabled,
       });
 
       // Render the root Application component.

From 272f14e3e545361669e3adc7d81bfe19dc88dcc8 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Wed, 25 Jul 2018 10:58:01 +0200
Subject: [PATCH 05/29] Bug 1470922 - Fix tests failing with the new Jsterm;
 r=bgrins.

MozReview-Commit-ID: EaOSFmWa1tZ

--HG--
extra : rebase_source : 7a499966af0bb4f318fa6d66c8e714a40207e638
---
 .../framework/test/browser_toolbox_split_console.js    | 10 ++++++----
 .../test/browser_inspector_menu-04-use-in-console.js   |  5 ++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/devtools/client/framework/test/browser_toolbox_split_console.js b/devtools/client/framework/test/browser_toolbox_split_console.js
index 63c469fd747e..fa40ba1268d0 100644
--- a/devtools/client/framework/test/browser_toolbox_split_console.js
+++ b/devtools/client/framework/test/browser_toolbox_split_console.js
@@ -52,8 +52,7 @@ function testUseKeyWithSplitConsole() {
   }, "jsdebugger");
 
   info("synthesizeKey with the console focused");
-  const consoleInput = gToolbox.getPanel("webconsole").hud.jsterm.inputNode;
-  consoleInput.focus();
+  focusConsoleInput();
   synthesizeKeyShortcut("F3", panelWin);
 
   ok(commandCalled, "Shortcut key should trigger the command");
@@ -69,8 +68,7 @@ function testUseKeyWithSplitConsoleWrongTool() {
   }, "inspector");
 
   info("synthesizeKey with the console focused");
-  const consoleInput = gToolbox.getPanel("webconsole").hud.jsterm.inputNode;
-  consoleInput.focus();
+  focusConsoleInput();
   synthesizeKeyShortcut("F4", panelWin);
 
   ok(!commandCalled, "Shortcut key shouldn't trigger the command");
@@ -81,3 +79,7 @@ async function cleanup() {
   gBrowser.removeCurrentTab();
   gToolbox = panelWin = null;
 }
+
+function focusConsoleInput() {
+  gToolbox.getPanel("webconsole").hud.jsterm.focus();
+}
diff --git a/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js b/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
index 46a36a6b6d00..19a41db4acd0 100644
--- a/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
+++ b/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
@@ -28,8 +28,7 @@ add_task(async function() {
     const hud = toolbox.getPanel("webconsole").hud;
     const jsterm = hud.jsterm;
 
-    const jstermInput = jsterm.hud.document.querySelector(".jsterm-input-node");
-    is(jstermInput.value, "temp0", "first console variable is named temp0");
+    is(jsterm.getInputValue(), "temp0", "first console variable is named temp0");
 
     let result = await jsterm.execute();
     isnot(result.textContent.indexOf('<p id="console-var">'), -1,
@@ -39,7 +38,7 @@ add_task(async function() {
     menuItem.click();
     await inspector.once("console-var-ready");
 
-    is(jstermInput.value, "temp1", "second console variable is named temp1");
+    is(jsterm.getInputValue(), "temp1", "second console variable is named temp1");
 
     result = await jsterm.execute();
     isnot(result.textContent.indexOf('<p id="console-var-multi">'), -1,

From 00a096952681adbe351749a7cb4327e6cd15111f Mon Sep 17 00:00:00 2001
From: Rob Wu <rob@robwu.nl>
Date: Thu, 24 May 2018 19:16:49 +0200
Subject: [PATCH 06/29] Bug 1457115 - Simplify *_ext_tabs_executeScript_bad.*
 r=rpl

MozReview-Commit-ID: 6FpmCLmePVP

--HG--
extra : rebase_source : f0ad0a5635de05ec7c4f81dbdb27f3c181bb2baf
---
 .../browser_ext_tabs_executeScript_bad.js     | 41 +++++--------------
 .../test_ext_tabs_executeScript_bad.html      | 29 +++----------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
index 7ce9787fc1df..9041e891e4b2 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
@@ -4,27 +4,14 @@ async function testHasNoPermission(params) {
   let contentSetup = params.contentSetup || (() => Promise.resolve());
 
   async function background(contentSetup) {
-    browser.runtime.onMessage.addListener((msg, sender) => {
-      browser.test.assertEq(msg, "second script ran", "second script ran");
-      browser.test.notifyPass("executeScript");
-    });
-
     browser.test.onMessage.addListener(async msg => {
       browser.test.assertEq(msg, "execute-script");
 
-      let tabs = await browser.tabs.query({currentWindow: true});
       await browser.test.assertRejects(browser.tabs.executeScript({
         file: "script.js",
       }), /Missing host permission for the tab/);
 
-      // TODO bug 1457115: Remove the executeScript call below.
-
-      // Execute a script we know we have permissions for in the
-      // second tab, in the hopes that it will execute after the
-      // first one.
-      browser.tabs.executeScript(tabs[1].id, {
-        file: "second-script.js",
-      });
+      browser.test.notifyPass("executeScript");
     });
 
     await contentSetup();
@@ -41,10 +28,6 @@ async function testHasNoPermission(params) {
       "script.js": function() {
         browser.runtime.sendMessage("first script ran");
       },
-
-      "second-script.js": function() {
-        browser.runtime.sendMessage("second script ran");
-      },
     },
   });
 
@@ -62,23 +45,22 @@ async function testHasNoPermission(params) {
 }
 
 add_task(async function testBadPermissions() {
-  let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://example.com/");
-  let tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
 
   info("Test no special permissions");
   await testHasNoPermission({
-    manifest: {"permissions": ["http://example.com/"]},
+    manifest: {"permissions": []},
   });
 
   info("Test tabs permissions");
   await testHasNoPermission({
-    manifest: {"permissions": ["http://example.com/", "tabs"]},
+    manifest: {"permissions": ["tabs"]},
   });
 
   info("Test no special permissions, commands, key press");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/"],
+      "permissions": [],
       "commands": {
         "test-tabs-executeScript": {
           "suggested_key": {
@@ -104,7 +86,7 @@ add_task(async function testBadPermissions() {
   info("Test no special permissions, _execute_browser_action command");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/"],
+      "permissions": [],
       "browser_action": {},
       "commands": {
         "_execute_browser_action": {
@@ -129,7 +111,7 @@ add_task(async function testBadPermissions() {
   info("Test no special permissions, _execute_page_action command");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/"],
+      "permissions": [],
       "page_action": {},
       "commands": {
         "_execute_page_action": {
@@ -155,7 +137,7 @@ add_task(async function testBadPermissions() {
   info("Test active tab, commands, no key press");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/", "activeTab"],
+      "permissions": ["activeTab"],
       "commands": {
         "test-tabs-executeScript": {
           "suggested_key": {
@@ -169,7 +151,7 @@ add_task(async function testBadPermissions() {
   info("Test active tab, browser action, no click");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/", "activeTab"],
+      "permissions": ["activeTab"],
       "browser_action": {},
     },
   });
@@ -177,7 +159,7 @@ add_task(async function testBadPermissions() {
   info("Test active tab, page action, no click");
   await testHasNoPermission({
     manifest: {
-      "permissions": ["http://example.com/", "activeTab"],
+      "permissions": ["activeTab"],
       "page_action": {},
     },
     contentSetup: async function() {
@@ -186,8 +168,7 @@ add_task(async function testBadPermissions() {
     },
   });
 
-  BrowserTestUtils.removeTab(tab2);
-  BrowserTestUtils.removeTab(tab1);
+  BrowserTestUtils.removeTab(tab);
 });
 
 add_task(async function testMatchDataURI() {
diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html b/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html
index 954e8b249c39..2bdf8d92d3d2 100644
--- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html
+++ b/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html
@@ -17,27 +17,14 @@ function* testHasNoPermission(params) {
   let contentSetup = params.contentSetup || (() => Promise.resolve());
 
   async function background(contentSetup) {
-    browser.runtime.onMessage.addListener((msg, sender) => {
-      browser.test.assertEq(msg, "second script ran", "second script ran");
-      browser.test.notifyPass("executeScript");
-    });
-
     browser.test.onMessage.addListener(async msg => {
       browser.test.assertEq(msg, "execute-script");
 
-      let tabs = await browser.tabs.query({currentWindow: true});
       await browser.test.assertRejects(browser.tabs.executeScript({
         file: "script.js",
       }), /Missing host permission for the tab/);
 
-      // TODO bug 1457115: Remove the executeScript call below.
-
-      // Execute a script we know we have permissions for in the
-      // second tab, in the hopes that it will execute after the
-      // first one.
-      browser.tabs.executeScript(tabs[1].id, {
-        file: "second-script.js",
-      });
+      browser.test.notifyPass("executeScript");
     });
 
     await contentSetup();
@@ -54,10 +41,6 @@ function* testHasNoPermission(params) {
       "script.js": function() {
         browser.runtime.sendMessage("first script ran");
       },
-
-      "second-script.js": function() {
-        browser.runtime.sendMessage("second script ran");
-      },
     },
   });
 
@@ -75,23 +58,21 @@ function* testHasNoPermission(params) {
 }
 
 add_task(async function testBadPermissions() {
-  let win1 = window.open("http://example.com/");
-  let win2 = window.open("http://mochi.test:8888/");
+  let win = window.open("http://mochi.test:8888/");
 
   await new Promise(resolve => setTimeout(resolve, 0));
 
   info("Test no special permissions");
   await testHasNoPermission({
-    manifest: {"permissions": ["http://example.com/"]},
+    manifest: {"permissions": []},
   });
 
   info("Test tabs permissions");
   await testHasNoPermission({
-    manifest: {"permissions": ["http://example.com/", "tabs"]},
+    manifest: {"permissions": ["tabs"]},
   });
 
-  win2.close();
-  win1.close();
+  win.close();
 });
 
 add_task(async function testBadURL() {

From fd9c2c8706b3b40ff6618cfce85738c01c6b04f2 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Mon, 16 Jul 2018 14:50:00 +0100
Subject: [PATCH 07/29] Bug 1474356 - Most other panel openings without
 panel_name r=nchevobbe

Changes:

Pretty much all files contain changes to the order of events and properties... these are to stop subtle issues with events not being logged because not all properties were sent and some events were sent in the wrong order.

-devtools/client/framework/test/browser_devtools_api.js
  - Renamed test-tool-1 and 2 because we need to include the panel names in Events.yaml and "-" is not allowed.
- devtools/client/framework/toolbox.js
  - Removed unneeded const REGEX_PANEL.
  - Generally shifted things around to ensure we send events from all codepaths.
- toolkit/components/telemetry/Events.yaml
  - Changed telemetry event `"devtools.main", "enter"` to include all built-in panel names including  "other."

MozReview-Commit-ID: 2G3Z9pzj1QC

--HG--
extra : rebase_source : 54920e6fe2116a3112fefe17715b5b22ad6f5d32
---
 .../framework/test/browser_devtools_api.js    |  4 +--
 .../browser_toolbox_dynamic_registration.js   |  8 ++---
 .../framework/test/browser_toolbox_options.js |  8 ++---
 ...owser_toolbox_selected_tool_unavailable.js |  4 +--
 .../browser_toolbox_textbox_context_menu.js   |  2 +-
 devtools/client/framework/toolbox.js          | 30 +++++++++++--------
 devtools/client/shared/telemetry.js           |  6 +++-
 .../webconsole/webconsole-output-wrapper.js   |  9 ++++--
 toolkit/components/telemetry/Events.yaml      | 10 +++----
 9 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/devtools/client/framework/test/browser_devtools_api.js b/devtools/client/framework/test/browser_devtools_api.js
index fc720a87bf20..56588af9747e 100644
--- a/devtools/client/framework/test/browser_devtools_api.js
+++ b/devtools/client/framework/test/browser_devtools_api.js
@@ -7,8 +7,8 @@
 
 "use strict";
 
-const toolId1 = "test-tool-1";
-const toolId2 = "test-tool-2";
+const toolId1 = "testtool1";
+const toolId2 = "testtool2";
 
 function test() {
   addTab("about:blank").then(runTests1);
diff --git a/devtools/client/framework/test/browser_toolbox_dynamic_registration.js b/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
index ffc8f4aa5ee5..8be72b6a5afa 100644
--- a/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
+++ b/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
@@ -19,7 +19,7 @@ function testRegister(aToolbox) {
   gDevTools.once("tool-registered", toolRegistered);
 
   gDevTools.registerTool({
-    id: "test-tool",
+    id: "testTool",
     label: "Test Tool",
     inMenu: true,
     isTargetSupported: () => true,
@@ -28,7 +28,7 @@ function testRegister(aToolbox) {
 }
 
 function toolRegistered(toolId) {
-  is(toolId, "test-tool", "tool-registered event handler sent tool id");
+  is(toolId, "testTool", "tool-registered event handler sent tool id");
 
   ok(gDevTools.getToolDefinitionMap().has(toolId), "tool added to map");
 
@@ -61,11 +61,11 @@ function getAllBrowserWindows() {
 function testUnregister() {
   gDevTools.once("tool-unregistered", toolUnregistered);
 
-  gDevTools.unregisterTool("test-tool");
+  gDevTools.unregisterTool("testTool");
 }
 
 function toolUnregistered(toolId) {
-  is(toolId, "test-tool", "tool-unregistered event handler sent tool id");
+  is(toolId, "testTool", "tool-unregistered event handler sent tool id");
 
   ok(!gDevTools.getToolDefinitionMap().has(toolId), "tool removed from map");
 
diff --git a/devtools/client/framework/test/browser_toolbox_options.js b/devtools/client/framework/test/browser_toolbox_options.js
index 98cdb984b429..2690551d1c6c 100644
--- a/devtools/client/framework/test/browser_toolbox_options.js
+++ b/devtools/client/framework/test/browser_toolbox_options.js
@@ -39,7 +39,7 @@ add_task(async function() {
 
 function registerNewTool() {
   const toolDefinition = {
-    id: "test-tool",
+    id: "testTool",
     isTargetSupported: () => true,
     visibilityswitch: "devtools.test-tool.enabled",
     url: "about:blank",
@@ -47,11 +47,11 @@ function registerNewTool() {
   };
 
   ok(gDevTools, "gDevTools exists");
-  ok(!gDevTools.getToolDefinitionMap().has("test-tool"),
+  ok(!gDevTools.getToolDefinitionMap().has("testTool"),
     "The tool is not registered");
 
   gDevTools.registerTool(toolDefinition);
-  ok(gDevTools.getToolDefinitionMap().has("test-tool"),
+  ok(gDevTools.getToolDefinitionMap().has("testTool"),
     "The tool is registered");
 }
 
@@ -476,7 +476,7 @@ async function lookupButtonForToolId(toolId) {
 }
 
 async function cleanup() {
-  gDevTools.unregisterTool("test-tool");
+  gDevTools.unregisterTool("testTool");
   await toolbox.destroy();
   gBrowser.removeCurrentTab();
   for (const pref of modifiedPrefs) {
diff --git a/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js b/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
index 5cd2dd50ba8b..92c9af57bf39 100644
--- a/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
+++ b/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
@@ -9,7 +9,7 @@
 // tool is not supported.
 
 const testToolDefinition = {
-  id: "test-tool",
+  id: "testTool",
   isTargetSupported: () => true,
   visibilityswitch: "devtools.test-tool.enabled",
   url: "about:blank",
@@ -31,7 +31,7 @@ add_task(async function() {
   let target = TargetFactory.forTab(tab);
 
   let toolbox = await gDevTools.showToolbox(target, testToolDefinition.id);
-  is(toolbox.currentToolId, "test-tool", "test-tool was selected");
+  is(toolbox.currentToolId, "testTool", "test-tool was selected");
   await gDevTools.closeToolbox(target);
 
   // Make the previously selected tool unavailable.
diff --git a/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js b/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
index cdf10bbf3451..bfdd5c4e9323 100644
--- a/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
+++ b/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
@@ -10,7 +10,7 @@
 // right state, and that it works for an input inside of a panel.
 
 const URL = "data:text/html;charset=utf8,test for textbox context menu";
-const textboxToolId = "test-tool-1";
+const textboxToolId = "testtool1";
 
 registerCleanupFunction(() => {
   gDevTools.unregisterTool(textboxToolId);
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 39e818da0df8..83f958b12967 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -13,8 +13,6 @@ const DISABLE_AUTOHIDE_PREF = "ui.popup.disable_autohide";
 const HOST_HISTOGRAM = "DEVTOOLS_TOOLBOX_HOST";
 const CURRENT_THEME_SCALAR = "devtools.current_theme";
 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const REGEX_PANEL =
-  /^(?:webconsole|inspector|jsdebugger|styleeditor|netmonitor|storage)$/;
 
 var {Ci, Cc} = require("chrome");
 var promise = require("promise");
@@ -1929,16 +1927,17 @@ Toolbox.prototype = {
     const pending = ["host", "width", "start_state", "panel_name", "cold", "session_id"];
     if (id === "webconsole") {
       pending.push("message_count");
-
-      // Cold webconsole event message_count is handled in
-      // devtools/client/webconsole/webconsole-output-wrapper.js
-      if (!cold) {
-        this.telemetry.addEventProperty(
-          "devtools.main", "enter", "webconsole", null, "message_count", 0);
-      }
     }
-    this.telemetry.preparePendingEvent(
-      "devtools.main", "enter", panelName, null, pending);
+
+    this.telemetry.preparePendingEvent("devtools.main", "enter", panelName, null, pending);
+
+    // Cold webconsole event message_count is handled in
+    // devtools/client/webconsole/webconsole-output-wrapper.js
+    if (!cold && id === "webconsole") {
+      this.telemetry.addEventProperty(
+        "devtools.main", "enter", "webconsole", null, "message_count", 0);
+    }
+
     this.telemetry.addEventProperty(
       "devtools.main", "open", "tools", null, "session_id", this.sessionId
     );
@@ -2910,6 +2909,7 @@ Toolbox.prototype = {
     }
 
     this.browserRequire = null;
+    this._toolNames = null;
 
     // Now that we are closing the toolbox we can re-enable the cache settings
     // and disable the service workers testing settings for the current tab.
@@ -3378,7 +3378,13 @@ Toolbox.prototype = {
   },
 
   getTelemetryPanelNameOrOther: function(id) {
-    if (!REGEX_PANEL.test(id)) {
+    if (!this._toolNames) {
+      const definitions = gDevTools.getToolDefinitionArray();
+      const definitionIds = definitions.map(definition => definition.id);
+
+      this._toolNames = new Set(definitionIds);
+    }
+    if (!this._toolNames.has(id)) {
       return "other";
     }
     return id;
diff --git a/devtools/client/shared/telemetry.js b/devtools/client/shared/telemetry.js
index 7cc1671b747d..fb35ec57a0d2 100644
--- a/devtools/client/shared/telemetry.js
+++ b/devtools/client/shared/telemetry.js
@@ -553,6 +553,10 @@ class Telemetry {
   toolOpened(id) {
     const charts = getChartsFromToolId(id);
 
+    if (!charts) {
+      return;
+    }
+
     if (charts.timerHist) {
       this.start(charts.timerHist, this);
     }
@@ -577,7 +581,7 @@ class Telemetry {
   toolClosed(id) {
     const charts = getChartsFromToolId(id);
 
-    if (charts.timerHist) {
+    if (charts && charts.timerHist) {
       this.finish(charts.timerHist, this);
     }
   }
diff --git a/devtools/client/webconsole/webconsole-output-wrapper.js b/devtools/client/webconsole/webconsole-output-wrapper.js
index 08679dcc33a3..1d4267135d08 100644
--- a/devtools/client/webconsole/webconsole-output-wrapper.js
+++ b/devtools/client/webconsole/webconsole-output-wrapper.js
@@ -431,8 +431,13 @@ WebConsoleOutputWrapper.prototype = {
         store.dispatch(actions.messagesAdd(this.queuedMessageAdds));
 
         const length = this.queuedMessageAdds.length;
-        this.telemetry.addEventProperty(
-          "devtools.main", "enter", "webconsole", null, "message_count", length);
+
+        // This telemetry event is only useful when we have a toolbox so only
+        // send it when we have one.
+        if (this.toolbox) {
+          this.telemetry.addEventProperty(
+            "devtools.main", "enter", "webconsole", null, "message_count", length);
+        }
 
         this.queuedMessageAdds = [];
 
diff --git a/toolkit/components/telemetry/Events.yaml b/toolkit/components/telemetry/Events.yaml
index 322ae4bde562..3c4ec2c2136f 100644
--- a/toolkit/components/telemetry/Events.yaml
+++ b/toolkit/components/telemetry/Events.yaml
@@ -447,7 +447,7 @@ devtools.main:
       width: Toolbox width rounded up to the nearest 50px.
       session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
   enter:
-    objects: ["webconsole", "inspector", "jsdebugger", "styleeditor", "netmonitor", "storage", "other"]
+    objects: ["accessibility", "application", "canvasdebugger", "dom", "inspector", "jsdebugger", "memory", "netmonitor", "options", "performance", "scratchpad", "shadereditor", "storage", "styleeditor", "webaudioeditor", "webconsole", "other", "fakeTool4242", "testBlankPanel", "testTool", "testtool1", "testTool1072208", "testtool2"]
     bug_numbers: [1441070]
     notification_emails: ["dev-developer-tools@lists.mozilla.org", "hkirschner@mozilla.com"]
     record_in_processes: ["main"]
@@ -459,11 +459,11 @@ devtools.main:
       width: Toolbox width rounded up to the nearest 50px.
       message_count: The number of cached console messages.
       start_state: debuggerStatement, breakpoint, exception, tab_switch, toolbox_show, initial_panel, toggle_settings_off, toggle_settings_on, key_shortcut, select_next_key, select_prev_key, tool_unloaded, inspect_dom, unknown etc.
-      panel_name: The name of the panel opened, webconsole, inspector, jsdebugger, styleeditor, netmonitor, storage or other
+      panel_name: The name of the panel opened or other
       cold: Is this the first time the current panel has been opened in this toolbox?
       session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
   exit:
-    objects: ["webconsole", "inspector", "jsdebugger", "styleeditor", "netmonitor", "storage", "other"]
+    objects: ["accessibility", "application", "canvasdebugger", "dom", "inspector", "jsdebugger", "memory", "netmonitor", "options", "performance", "scratchpad", "shadereditor", "storage", "styleeditor", "webaudioeditor", "webconsole", "other", "fakeTool4242", "testBlankPanel", "testTool", "testtool1", "testTool1072208", "testtool2"]
     bug_numbers: [1455270]
     notification_emails: ["dev-developer-tools@lists.mozilla.org", "hkirschner@mozilla.com"]
     record_in_processes: ["main"]
@@ -473,8 +473,8 @@ devtools.main:
     extra_keys:
       host: "Toolbox host (positioning): bottom, side, window or other."
       width: Toolbox width rounded up to the nearest 50px.
-      next_panel: The name of the panel closed, webconsole, inspector, jsdebugger, styleeditor, netmonitor, storage or other.
-      panel_name: The name of the panel opened, webconsole, inspector, jsdebugger, styleeditor, netmonitor, storage or other
+      next_panel: The name of the panel closed or other.
+      panel_name: The name of the panel opened or other
       reason: debuggerStatement, breakpoint, exception, tab_switch, toolbox_show, initial_panel, toggle_settings_off, toggle_settings_on, key_shortcut, select_next_key, select_prev_key, tool_unloaded, inspect_dom, toolbox_closed, unknown etc.
       session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
   activate:

From 5512ec1b22e2adf29418830950f94ee351e99dbd Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Fri, 27 Jul 2018 15:12:36 +0000
Subject: [PATCH 08/29] Bug 1477021 - Schedule pipfile updates to run once per
 week. r=sfraser

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

--HG--
extra : moz-landing-system : lando
---
 .cron.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.cron.yml b/.cron.yml
index c961a8757d63..e0336e05676a 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -145,3 +145,16 @@ jobs:
               mozilla-esr60:
                   - {weekday: 'Monday', hour: 10, minute: 0}
                   - {weekday: 'Thursday', hour: 10, minute: 0}
+
+    - name: pipfile-update
+      job:
+          type: decision-task
+          treeherder-symbol: Nfile
+          target-tasks-method: pipfile_update
+      run-on-projects:
+          - mozilla-central
+      when:
+          by-project:
+              # No default branch
+              mozilla-central:
+                  - {weekday: 'Monday', hour: 10, minute: 0}

From 13db3cdb424655a25b36ba69de1f5863addcc936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <tarek@mozilla.com>
Date: Fri, 27 Jul 2018 14:11:54 +0200
Subject: [PATCH 09/29] Bug 1468550 - Track webextension activity - r=kmag

Adds a performance counter in ParentAPIManager to track the
number and duration of API calls by webextensions.

MozReview-Commit-ID: PTpaSCkE6A

--HG--
extra : rebase_source : e9a61cf0cf755db96f1fd0dacbc2744fe19fe08e
---
 modules/libpref/init/all.js                   |  3 ++
 .../components/extensions/ExtensionParent.jsm | 32 +++++++++++++-
 .../xpcshell/test_ext_performance_counters.js | 43 +++++++++++++++++++
 .../test/xpcshell/xpcshell-common.ini         |  1 +
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index aa4f16f567b5..61320d41d707 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4969,6 +4969,9 @@ pref("extensions.webextensions.background-delayed-startup", false);
 // Whether or not the installed extensions should be migrated to the storage.local IndexedDB backend.
 pref("extensions.webextensions.ExtensionStorageIDB.enabled", false);
 
+// if enabled, store execution times for API calls
+pref("extensions.webextensions.enablePerformanceCounters", false);
+
 // Report Site Issue button
 pref("extensions.webcompat-reporter.newIssueEndpoint", "https://webcompat.com/issues/new");
 #if defined(MOZ_DEV_EDITION) || defined(NIGHTLY_BUILD)
diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index e54630b82a8d..4be1c0b0b388 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -60,6 +60,7 @@ const BASE_SCHEMA = "chrome://extensions/content/schemas/manifest.json";
 const CATEGORY_EXTENSION_MODULES = "webextension-modules";
 const CATEGORY_EXTENSION_SCHEMAS = "webextension-schemas";
 const CATEGORY_EXTENSION_SCRIPTS = "webextension-scripts";
+const TIMING_ENABLED_PREF = "extensions.webextensions.enablePerformanceCounters";
 
 let schemaURLs = new Set();
 
@@ -749,6 +750,9 @@ class DevToolsExtensionPageContextParent extends ExtensionPageContextParent {
 }
 
 ParentAPIManager = {
+  // stores dispatches counts per web extension and API
+  performanceCounters: new DefaultMap(() => new DefaultMap(() => ({duration: 0, calls: 0}))),
+
   proxyContexts: new Map(),
 
   init() {
@@ -759,6 +763,7 @@ ParentAPIManager = {
     Services.mm.addMessageListener("API:Call", this);
     Services.mm.addMessageListener("API:AddListener", this);
     Services.mm.addMessageListener("API:RemoveListener", this);
+    XPCOMUtils.defineLazyPreferenceGetter(this, "_timingEnabled", TIMING_ENABLED_PREF, false);
   },
 
   attachMessageManager(extension, processMessageManager) {
@@ -876,6 +881,26 @@ ParentAPIManager = {
     }
   },
 
+  storeExecutionTime(webExtensionId, apiPath, duration) {
+    let apiCounter = this.performanceCounters.get(webExtensionId).get(apiPath);
+    apiCounter.duration += duration;
+    apiCounter.calls += 1;
+  },
+
+  async withTiming(data, callable) {
+    if (!this._timingEnabled) {
+      return callable();
+    }
+    let webExtId = data.childId.split(".")[0];
+    let start = Cu.now();
+    try {
+      return callable();
+    } finally {
+      let end = Cu.now();
+      this.storeExecutionTime(webExtId, data.path, end - start);
+    }
+  },
+
   async call(data, target) {
     let context = this.getContextById(data.childId);
     if (context.parentMessageManager !== target.messageManager) {
@@ -901,8 +926,11 @@ ParentAPIManager = {
       let args = data.args;
       let pendingBrowser = context.pendingEventBrowser;
       let fun = await context.apiCan.asyncFindAPIPath(data.path);
-      let result = context.withPendingBrowser(pendingBrowser,
-                                              () => fun(...args));
+      let result = this.withTiming(data, () => {
+        return context.withPendingBrowser(pendingBrowser,
+                                          () => fun(...args));
+      });
+
       if (data.callId) {
         result = result || Promise.resolve();
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js b/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js
new file mode 100644
index 000000000000..b8520d5dd8fc
--- /dev/null
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js
@@ -0,0 +1,43 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+"use strict";
+
+ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
+const ENABLE_COUNTER_PREF = "extensions.webextensions.enablePerformanceCounters";
+
+let {
+  ParentAPIManager,
+} = ExtensionParent;
+
+
+async function test_counter() {
+  async function background() {
+    // creating a bookmark
+    let folder = await browser.bookmarks.create({title: "Folder"});
+    await browser.bookmarks.create({title: "Bookmark", url: "http://example.com",
+                                    parentId: folder.id});
+    browser.test.sendMessage("done");
+  }
+
+  let extensionData = {
+    background,
+    manifest: {
+      permissions: ["bookmarks"],
+    },
+  };
+
+  let extension = ExtensionTestUtils.loadExtension(extensionData);
+  await extension.startup();
+  await extension.awaitMessage("done");
+  await extension.unload();
+
+  // check that the bookmarks.create API was tracked
+  let counters = ParentAPIManager.performanceCounters;
+  let counter = counters.get(extension.id).get("bookmarks.create");
+  ok(counter.calls > 0);
+  ok(counter.duration > 0);
+}
+
+add_task(function test_performance_counter() {
+  return runWithPrefs([[ENABLE_COUNTER_PREF, true]], test_counter);
+});
diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
index 5122f11ecc4c..a5a638b1c0ee 100644
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
@@ -134,3 +134,4 @@ skip-if = os == "android" # Bug 1350559
 [test_proxy_scripts.js]
 [test_proxy_scripts_results.js]
 [test_ext_brokenlinks.js]
+[test_ext_performance_counters.js]

From bac87efd04e06c7385f9cdc250dabfa76072fa69 Mon Sep 17 00:00:00 2001
From: Lina Cambridge <lina@yakshaving.ninja>
Date: Fri, 27 Jul 2018 14:14:38 +0000
Subject: [PATCH 10/29] Bug 1478922 - Stage bookmark tags to upload in a
 separate table instead of using a subquery. r=mak

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

--HG--
extra : moz-landing-system : lando
---
 .../places/SyncedBookmarksMirror.jsm          | 58 +++++++++++++------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/toolkit/components/places/SyncedBookmarksMirror.jsm b/toolkit/components/places/SyncedBookmarksMirror.jsm
index f4fc1d74a1df..899719d88d33 100644
--- a/toolkit/components/places/SyncedBookmarksMirror.jsm
+++ b/toolkit/components/places/SyncedBookmarksMirror.jsm
@@ -1628,19 +1628,13 @@ class SyncedBookmarksMirror {
       WITH RECURSIVE
       ${LocalItemsSQLFragment}
       INSERT INTO itemsToUpload(id, guid, syncChangeCounter, parentGuid,
-                                parentTitle, dateAdded, type, title, isQuery,
-                                url, tags, keyword, feedURL, siteURL,
+                                parentTitle, dateAdded, type, title, placeId,
+                                isQuery, url, keyword, feedURL, siteURL,
                                 position, tagFolderName)
       SELECT s.id, s.guid, s.syncChangeCounter, s.parentGuid, s.parentTitle,
-             s.dateAdded / 1000, s.type, s.title,
+             s.dateAdded / 1000, s.type, s.title, s.placeId,
              IFNULL(SUBSTR(h.url, 1, 6) = 'place:', 0) AS isQuery,
              h.url,
-             (SELECT GROUP_CONCAT(t.title, ',') FROM moz_bookmarks e
-              JOIN moz_bookmarks t ON t.id = e.parent
-              JOIN moz_bookmarks r ON r.id = t.parent
-              WHERE s.type = :bookmarkType AND
-                    r.guid = :tagsGuid AND
-                    e.fk = h.id),
              (SELECT keyword FROM moz_keywords WHERE place_id = h.id),
              (SELECT a.content FROM moz_items_annos a
               JOIN moz_anno_attributes n ON n.id = a.anno_attribute_id
@@ -1660,9 +1654,7 @@ class SyncedBookmarksMirror {
       LEFT JOIN idsToWeaklyUpload w ON w.id = s.id
       WHERE s.syncChangeCounter >= 1 OR
             w.id NOT NULL`,
-      { bookmarkType: PlacesUtils.bookmarks.TYPE_BOOKMARK,
-        tagsGuid: PlacesUtils.bookmarks.tagsGuid,
-        folderType: PlacesUtils.bookmarks.TYPE_FOLDER,
+      { folderType: PlacesUtils.bookmarks.TYPE_FOLDER,
         feedURLAnno: PlacesUtils.LMANNO_FEEDURI,
         siteURLAnno: PlacesUtils.LMANNO_SITEURI });
 
@@ -1673,6 +1665,13 @@ class SyncedBookmarksMirror {
       SELECT b.guid, b.parent, b.position FROM moz_bookmarks b
       JOIN itemsToUpload o ON o.id = b.parent`);
 
+    // Stage tags for outgoing bookmarks.
+    await this.db.execute(`
+      INSERT INTO tagsToUpload(id, tag)
+      SELECT o.id, t.tag
+      FROM localTags t
+      JOIN itemsToUpload o ON o.placeId = t.placeId`);
+
     // Finally, stage tombstones for deleted items. Ignore conflicts if we have
     // tombstones for undeleted items; Places Maintenance should clean these up.
     await this.db.execute(`
@@ -1690,6 +1689,7 @@ class SyncedBookmarksMirror {
   async fetchLocalChangeRecords() {
     let changeRecords = {};
     let childRecordIdsByLocalParentId = new Map();
+    let tagsByLocalId = new Map();
 
     let childGuidRows = await this.db.execute(`
       SELECT parentId, guid FROM structureToUpload
@@ -1699,17 +1699,31 @@ class SyncedBookmarksMirror {
       let localParentId = row.getResultByName("parentId");
       let childRecordId = PlacesSyncUtils.bookmarks.guidToRecordId(
         row.getResultByName("guid"));
-      if (childRecordIdsByLocalParentId.has(localParentId)) {
-        let childRecordIds = childRecordIdsByLocalParentId.get(localParentId);
+      let childRecordIds = childRecordIdsByLocalParentId.get(localParentId);
+      if (childRecordIds) {
         childRecordIds.push(childRecordId);
       } else {
         childRecordIdsByLocalParentId.set(localParentId, [childRecordId]);
       }
     }
 
+    let tagRows = await this.db.execute(`
+      SELECT id, tag FROM tagsToUpload`);
+
+    for await (let row of yieldingIterator(tagRows)) {
+      let localId = row.getResultByName("id");
+      let tag = row.getResultByName("tag");
+      let tags = tagsByLocalId.get(localId);
+      if (tags) {
+        tags.push(tag);
+      } else {
+        tagsByLocalId.set(localId, [tag]);
+      }
+    }
+
     let itemRows = await this.db.execute(`
       SELECT id, syncChangeCounter, guid, isDeleted, type, isQuery,
-             tagFolderName, keyword, tags, url, IFNULL(title, "") AS title,
+             tagFolderName, keyword, url, IFNULL(title, "") AS title,
              feedURL, siteURL, position, parentGuid,
              IFNULL(parentTitle, "") AS parentTitle, dateAdded
       FROM itemsToUpload`);
@@ -1779,9 +1793,10 @@ class SyncedBookmarksMirror {
           if (keyword) {
             bookmarkCleartext.keyword = keyword;
           }
-          let tags = row.getResultByName("tags");
+          let localId = row.getResultByName("id");
+          let tags = tagsByLocalId.get(localId);
           if (tags) {
-            bookmarkCleartext.tags = tags.split(",");
+            bookmarkCleartext.tags = tags;
           }
           changeRecords[recordId] = new BookmarkChangeRecord(
             syncChangeCounter, bookmarkCleartext);
@@ -2720,9 +2735,9 @@ async function initializeTempMirrorEntities(db) {
     dateAdded INTEGER, /* In milliseconds. */
     type INTEGER,
     title TEXT,
+    placeId INTEGER,
     isQuery BOOLEAN NOT NULL DEFAULT 0,
     url TEXT,
-    tags TEXT,
     tagFolderName TEXT,
     keyword TEXT,
     feedURL TEXT,
@@ -2736,6 +2751,13 @@ async function initializeTempMirrorEntities(db) {
                               ON DELETE CASCADE,
     position INTEGER NOT NULL
   ) WITHOUT ROWID`);
+
+  await db.execute(`CREATE TEMP TABLE tagsToUpload(
+    id INTEGER REFERENCES itemsToUpload(id)
+               ON DELETE CASCADE,
+    tag TEXT,
+    PRIMARY KEY(id, tag)
+  ) WITHOUT ROWID`);
 }
 
 async function resetMirror(db) {

From 3bda10d3f6e2154779d7a072f8c0878d042edd5a Mon Sep 17 00:00:00 2001
From: Lina Cambridge <lina@yakshaving.ninja>
Date: Fri, 27 Jul 2018 08:18:44 +0000
Subject: [PATCH 11/29] Bug 1472435 - Ensure the `itemsToMerge` view in the
 bookmarks mirror ignores duplicate URLs. r=mak

If `moz_places` has duplicate rows for the same URL, joining on the URL
and hash includes the same item multiple times in `itemsToMerge`. This
causes constraint errors when we try to record observer notifications
for an item that we already saw.

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

--HG--
extra : moz-landing-system : lando
---
 .../places/SyncedBookmarksMirror.jsm          |  13 +-
 .../tests/sync/test_bookmark_value_changes.js | 181 ++++++++++++++++++
 2 files changed, 186 insertions(+), 8 deletions(-)

diff --git a/toolkit/components/places/SyncedBookmarksMirror.jsm b/toolkit/components/places/SyncedBookmarksMirror.jsm
index 899719d88d33..867225b42144 100644
--- a/toolkit/components/places/SyncedBookmarksMirror.jsm
+++ b/toolkit/components/places/SyncedBookmarksMirror.jsm
@@ -2253,18 +2253,15 @@ async function initializeTempMirrorEntities(db) {
               "v.dateAdded" is in milliseconds. */
            (CASE WHEN b.dateAdded / 1000 < v.dateAdded THEN b.dateAdded
                  ELSE v.dateAdded * 1000 END),
-           v.title, h.id, u.newPlaceId, v.keyword,
-           v.feedURL, v.siteURL
+           v.title, h.id, (SELECT n.id FROM moz_places n
+                           WHERE n.url_hash = u.hash AND
+                                 n.url = u.url),
+           v.keyword, v.feedURL, v.siteURL
     FROM items v
     JOIN mergeStates r ON r.mergedGuid = v.guid
     LEFT JOIN moz_bookmarks b ON b.guid = r.localGuid
     LEFT JOIN moz_places h ON h.id = b.fk
-    LEFT JOIN (
-      SELECT h.id AS newPlaceId, u.id AS urlId
-      FROM urls u
-      JOIN moz_places h ON h.url_hash = u.hash AND
-                           h.url = u.url
-    ) u ON u.urlId = v.urlId
+    LEFT JOIN urls u ON u.id = v.urlId
     WHERE r.mergedGuid <> '${PlacesUtils.bookmarks.rootGuid}'`);
 
   // Changes local GUIDs to remote GUIDs, drops local tombstones for revived
diff --git a/toolkit/components/places/tests/sync/test_bookmark_value_changes.js b/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
index 266a24067bbd..565045c47607 100644
--- a/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
+++ b/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
@@ -1098,4 +1098,185 @@ add_task(async function test_date_added() {
   equal(bInfo.title, "B (remote)", "Should change local title for B");
   deepEqual(bInfo.dateAdded, bNewDateAdded,
     "Should take older date added for B");
+
+  await buf.finalize();
+  await PlacesUtils.bookmarks.eraseEverything();
+  await PlacesSyncUtils.bookmarks.reset();
+});
+
+// Bug 1472435.
+add_task(async function test_duplicate_url_rows() {
+  let buf = await openMirror("test_duplicate_url_rows");
+
+  let placesToInsert = [{
+    guid: "placeAAAAAAA",
+    href: "http://example.com",
+  }, {
+    guid: "placeBBBBBBB",
+    href: "http://example.com",
+  }, {
+    guid: "placeCCCCCCC",
+    href: "http://example.com/c",
+  }];
+
+  let itemsToInsert = [{
+    guid: "bookmarkAAAA",
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
+    placeGuid: "placeAAAAAAA",
+    localTitle: "A",
+    remoteTitle: "A (remote)",
+  }, {
+    guid: "bookmarkBBBB",
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    placeGuid: "placeBBBBBBB",
+    localTitle: "B",
+    remoteTitle: "B (remote)",
+  }, {
+    guid: "bookmarkCCCC",
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    placeGuid: "placeCCCCCCC",
+    localTitle: "C",
+    remoteTitle: "C (remote)",
+  }];
+
+  info("Manually insert local and remote items with duplicate URLs");
+  await buf.db.executeTransaction(async function() {
+    for (let { guid, href } of placesToInsert) {
+      let url = new URL(href);
+      await buf.db.executeCached(`
+        INSERT INTO moz_places(url, url_hash, rev_host, hidden, frecency, guid)
+        VALUES(:url, hash(:url), :revHost, 0, -1, :guid)`,
+        { url: url.href, revHost: PlacesUtils.getReversedHost(url), guid });
+
+      await buf.db.executeCached(`
+        INSERT INTO urls(guid, url, hash, revHost)
+        VALUES(:guid, :url, hash(:url), :revHost)`,
+        { guid, url: url.href, revHost: PlacesUtils.getReversedHost(url) });
+    }
+
+    for (let { guid, parentGuid, placeGuid, localTitle, remoteTitle } of itemsToInsert) {
+      await buf.db.executeCached(`
+        INSERT INTO moz_bookmarks(guid, parent, fk, position, type, title,
+                                  syncStatus, syncChangeCounter)
+        VALUES(:guid, (SELECT id FROM moz_bookmarks WHERE guid = :parentGuid),
+               (SELECT id FROM moz_places WHERE guid = :placeGuid),
+               (SELECT count(*) FROM moz_bookmarks b
+                JOIN moz_bookmarks p ON p.id = b.parent
+                WHERE p.guid = :parentGuid), :type, :localTitle,
+                :syncStatus, 1)`,
+        { guid, parentGuid, placeGuid,
+          type: PlacesUtils.bookmarks.TYPE_BOOKMARK, localTitle,
+          syncStatus: PlacesUtils.bookmarks.SYNC_STATUS.NEW });
+
+      await buf.db.executeCached(`
+        INSERT INTO items(guid, needsMerge, kind, title, urlId)
+        VALUES(:guid, 1, :kind, :remoteTitle,
+               (SELECT id FROM urls WHERE guid = :placeGuid))`,
+        { guid, placeGuid, kind: SyncedBookmarksMirror.KIND.BOOKMARK,
+          remoteTitle });
+
+      await buf.db.executeCached(`
+        INSERT INTO structure(guid, parentGuid, position)
+        VALUES(:guid, :parentGuid,
+               IFNULL((SELECT count(*) FROM structure
+                       WHERE parentGuid = :parentGuid), 0))`,
+        { guid, parentGuid });
+    }
+  });
+
+  info("Apply mirror");
+  let observer = expectBookmarkChangeNotifications();
+  await buf.apply();
+  deepEqual(await buf.fetchUnmergedGuids(), [], "Should merge all items");
+
+  await assertLocalTree(PlacesUtils.bookmarks.rootGuid, {
+    guid: PlacesUtils.bookmarks.rootGuid,
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    index: 0,
+    title: "",
+    children: [{
+      guid: PlacesUtils.bookmarks.menuGuid,
+      type: PlacesUtils.bookmarks.TYPE_FOLDER,
+      index: 0,
+      title: BookmarksMenuTitle,
+      children: [{
+        guid: "bookmarkAAAA",
+        type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+        index: 0,
+        title: "A (remote)",
+        url: "http://example.com/",
+      }],
+    }, {
+      guid: PlacesUtils.bookmarks.toolbarGuid,
+      type: PlacesUtils.bookmarks.TYPE_FOLDER,
+      index: 1,
+      title: BookmarksToolbarTitle,
+      children: [{
+        guid: "bookmarkBBBB",
+        type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+        index: 0,
+        title: "B (remote)",
+        url: "http://example.com/",
+      }],
+    }, {
+      guid: PlacesUtils.bookmarks.unfiledGuid,
+      type: PlacesUtils.bookmarks.TYPE_FOLDER,
+      index: 3,
+      title: UnfiledBookmarksTitle,
+      children: [{
+        guid: "bookmarkCCCC",
+        type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+        index: 0,
+        title: "C (remote)",
+        url: "http://example.com/c",
+      }],
+    }, {
+      guid: PlacesUtils.bookmarks.mobileGuid,
+      type: PlacesUtils.bookmarks.TYPE_FOLDER,
+      index: 4,
+      title: MobileBookmarksTitle,
+    }],
+  }, "Should update titles for items with duplicate URLs");
+
+  let localItemIds = await PlacesUtils.promiseManyItemIds(["bookmarkAAAA",
+    "bookmarkBBBB", "bookmarkCCCC"]);
+  observer.check([{
+    name: "onItemChanged",
+    params: { itemId: localItemIds.get("bookmarkAAAA"), property: "title",
+              isAnnoProperty: false, newValue: "A (remote)",
+              type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+              parentId: PlacesUtils.bookmarksMenuFolderId, guid: "bookmarkAAAA",
+              parentGuid: PlacesUtils.bookmarks.menuGuid, oldValue: "A",
+              source: PlacesUtils.bookmarks.SOURCES.SYNC },
+  }, {
+    name: "onItemChanged",
+    params: { itemId: localItemIds.get("bookmarkBBBB"), property: "title",
+              isAnnoProperty: false, newValue: "B (remote)",
+              type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+              parentId: PlacesUtils.toolbarFolderId, guid: "bookmarkBBBB",
+              parentGuid: PlacesUtils.bookmarks.toolbarGuid, oldValue: "B",
+              source: PlacesUtils.bookmarks.SOURCES.SYNC },
+  }, {
+    name: "onItemChanged",
+    params: { itemId: localItemIds.get("bookmarkCCCC"), property: "title",
+              isAnnoProperty: false, newValue: "C (remote)",
+              type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+              parentId: PlacesUtils.unfiledBookmarksFolderId,
+              guid: "bookmarkCCCC",
+              parentGuid: PlacesUtils.bookmarks.unfiledGuid, oldValue: "C",
+              source: PlacesUtils.bookmarks.SOURCES.SYNC },
+  }]);
+
+  info("Remove duplicate URLs from Places to avoid tripping debug asserts");
+  await buf.db.executeTransaction(async function() {
+    for (let { guid } of placesToInsert) {
+      await buf.db.executeCached(`
+        DELETE FROM moz_places WHERE guid = :guid`,
+        { guid });
+    }
+  });
+
+  await buf.finalize();
+  await PlacesUtils.bookmarks.eraseEverything();
+  await PlacesSyncUtils.bookmarks.reset();
 });

From 23cf556fe1de94d12970a72e5d895dc3bd5c43fb Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 27 Jul 2018 15:16:57 +0000
Subject: [PATCH 12/29] Bug 1477996 - Move getURIsForTag to the bookmarking
 API. r=Standard8,lina

The tagging API is being merged into the bookmarking API. This is part of it.

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

--HG--
extra : moz-landing-system : lando
---
 .../components/places/content/controller.js   |  5 +-
 ...rowser_library_delete_bookmarks_in_tags.js |  2 +-
 .../unit/test_engine_changes_during_sync.js   |  5 +-
 toolkit/components/places/Bookmarks.jsm       | 68 ++++++++++++++++---
 .../components/places/PlacesTransactions.jsm  |  6 +-
 toolkit/components/places/PlacesUtils.jsm     |  3 +-
 .../components/places/nsITaggingService.idl   |  9 ---
 toolkit/components/places/nsTaggingService.js | 36 ----------
 .../places/tests/bookmarks/test_tags.js       | 54 ++++++++++++++-
 .../tests/sync/test_bookmark_value_changes.js |  8 +--
 .../places/tests/sync/test_sync_utils.js      | 30 ++++----
 .../places/tests/unit/test_tagging.js         |  6 --
 12 files changed, 143 insertions(+), 89 deletions(-)

diff --git a/browser/components/places/content/controller.js b/browser/components/places/content/controller.js
index 32dcd18831f0..08d0c2b5080d 100644
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -810,8 +810,9 @@ PlacesController.prototype = {
         // child of the "Tags" query in the library, in all other places we
         // must only remove the query node.
         let tag = node.title;
-        let URIs = PlacesUtils.tagging.getURIsForTag(tag);
-        transactions.push(PlacesTransactions.Untag({ tag, urls: URIs }));
+        let urls = new Set();
+        await PlacesUtils.bookmarks.fetch({tags: [tag]}, b => urls.add(b.url));
+        transactions.push(PlacesTransactions.Untag({ tag, urls: Array.from(urls) }));
       } else if (PlacesUtils.nodeIsURI(node) &&
                  PlacesUtils.nodeIsQuery(node.parent) &&
                  PlacesUtils.asQuery(node.parent).queryOptions.queryType ==
diff --git a/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js b/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js
index 08feffb2d8cb..39839eff58ef 100644
--- a/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js
+++ b/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js
@@ -87,7 +87,7 @@ add_task(async function test_tags() {
   }
 
   // The tag should now not exist.
-  Assert.deepEqual(PlacesUtils.tagging.getURIsForTag("test"), [],
+  Assert.equal(await PlacesUtils.bookmarks.fetch({tags: ["test"]}), null,
                    "There should be no URIs remaining for the tag");
 
   tagsNode.containerOpen = false;
diff --git a/services/sync/tests/unit/test_engine_changes_during_sync.js b/services/sync/tests/unit/test_engine_changes_during_sync.js
index d2009eb1b547..814a726977ec 100644
--- a/services/sync/tests/unit/test_engine_changes_during_sync.js
+++ b/services/sync/tests/unit/test_engine_changes_during_sync.js
@@ -421,9 +421,10 @@ add_task(async function test_bookmark_change_during_sync() {
       "Folder 1 should have 3 children after first sync");
     await assertChildGuids(folder2_guid, [bmk4_guid, tagQuery_guid],
       "Folder 2 should have 2 children after first sync");
-    let taggedURIs = PlacesUtils.tagging.getURIsForTag("taggy");
+    let taggedURIs = [];
+    await PlacesUtils.bookmarks.fetch({tags: ["taggy"]}, b => taggedURIs.push(b.url));
     equal(taggedURIs.length, 1, "Should have 1 tagged URI");
-    equal(taggedURIs[0].spec, "https://example.org/",
+    equal(taggedURIs[0].href, "https://example.org/",
       "Synced tagged bookmark should appear in tagged URI list");
 
     changes = await PlacesSyncUtils.bookmarks.pullChanges();
diff --git a/toolkit/components/places/Bookmarks.jsm b/toolkit/components/places/Bookmarks.jsm
index 78a668bc8a19..7ffba6cdd89e 100644
--- a/toolkit/components/places/Bookmarks.jsm
+++ b/toolkit/components/places/Bookmarks.jsm
@@ -780,15 +780,12 @@ var Bookmarks = Object.freeze({
           // If we're updating a tag, we must notify all the tagged bookmarks
           // about the change.
           if (isTagging) {
-            let URIs = PlacesUtils.tagging.getURIsForTag(updatedItem.title);
-            for (let uri of URIs) {
-              for (let entry of (await fetchBookmarksByURL({ url: new URL(uri.spec) }, true))) {
-                notify(observers, "onItemChanged", [ entry._id, "tags", false, "",
-                                                     PlacesUtils.toPRTime(entry.lastModified),
-                                                     entry.type, entry._parentId,
-                                                     entry.guid, entry.parentGuid,
-                                                     "", updatedItem.source ]);
-              }
+            for (let entry of (await fetchBookmarksByTags({ tags: [updatedItem.title] }, true))) {
+              notify(observers, "onItemChanged", [ entry._id, "tags", false, "",
+                                                    PlacesUtils.toPRTime(entry.lastModified),
+                                                    entry.type, entry._parentId,
+                                                    entry.guid, entry.parentGuid,
+                                                    "", updatedItem.source ]);
             }
           }
         }
@@ -1200,6 +1197,13 @@ var Bookmarks = Object.freeze({
    *      retrieves the most recent item with the specified guid prefix.
    *      To retrieve ALL of the bookmarks for that guid prefix, you must pass
    *      in an onResult callback, that will be invoked once for each bookmark.
+   *  - tags
+   *      Retrieves the most recent item with all the specified tags.
+   *      The tags are matched in a case-insensitive way.
+   *      To retrieve ALL of the bookmarks having these tags, pass in an
+   *      onResult callback, that will be invoked once for each bookmark.
+   *      Note, there can be multiple bookmarks for the same url, if you need
+   *      unique tagged urls you can filter duplicates by accumulating in a Set.
    *
    * @param guidOrInfo
    *        The globally unique identifier of the item to fetch, or an
@@ -1235,15 +1239,18 @@ var Bookmarks = Object.freeze({
       info = { guid: guidOrInfo };
     } else if (Object.keys(info).length == 1) {
       // Just a faster code path.
-      if (!["url", "guid", "parentGuid", "index", "guidPrefix"].includes(Object.keys(info)[0]))
+      if (!["url", "guid", "parentGuid",
+            "index", "guidPrefix", "tags"].includes(Object.keys(info)[0])) {
         throw new Error(`Unexpected number of conditions provided: 0`);
+      }
     } else {
       // Only one condition at a time can be provided.
       let conditionsCount = [
         v => v.hasOwnProperty("guid"),
         v => v.hasOwnProperty("parentGuid") && v.hasOwnProperty("index"),
         v => v.hasOwnProperty("url"),
-        v => v.hasOwnProperty("guidPrefix")
+        v => v.hasOwnProperty("guidPrefix"),
+        v => v.hasOwnProperty("tags")
       ].reduce((old, fn) => old + fn(info) | 0, 0);
       if (conditionsCount != 1)
         throw new Error(`Unexpected number of conditions provided: ${conditionsCount}`);
@@ -1274,6 +1281,9 @@ var Bookmarks = Object.freeze({
         results = await fetchBookmarkByPosition(fetchInfo, options && options.concurrent);
       else if (fetchInfo.hasOwnProperty("guidPrefix"))
         results = await fetchBookmarksByGUIDPrefix(fetchInfo, options && options.concurrent);
+      else if (fetchInfo.hasOwnProperty("tags")) {
+        results = await fetchBookmarksByTags(fetchInfo, options && options.concurrent);
+      }
 
       if (!results)
         return null;
@@ -2054,6 +2064,42 @@ async function fetchBookmarkByPosition(info, concurrent) {
                                            query);
 }
 
+async function fetchBookmarksByTags(info, concurrent) {
+  let query = async function(db) {
+    let rows = await db.executeCached(
+      `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
+              b.dateAdded, b.lastModified, b.type, IFNULL(b.title, "") AS title,
+              h.url AS url, b.id AS _id, b.parent AS _parentId,
+              NULL AS _childCount,
+              p.parent AS _grandParentId, b.syncStatus AS _syncStatus
+       FROM moz_bookmarks b
+       JOIN moz_bookmarks p ON p.id = b.parent
+       JOIN moz_bookmarks g ON g.id = p.parent
+       JOIN moz_places h ON h.id = b.fk
+       WHERE g.guid <> ? AND b.fk IN (
+          SELECT b2.fk FROM moz_bookmarks b2
+          JOIN moz_bookmarks p2 ON p2.id = b2.parent
+          JOIN moz_bookmarks g2 ON g2.id = p2.parent
+          WHERE g2.guid = ?
+                AND lower(p2.title) IN (
+                  ${new Array(info.tags.length).fill("?").join(",")}
+                )
+          GROUP BY b2.fk HAVING count(*) = ${info.tags.length}
+       )
+       ORDER BY b.lastModified DESC
+      `, [Bookmarks.tagsGuid, Bookmarks.tagsGuid].concat(info.tags.map(t => t.toLowerCase())));
+
+    return rows.length ? rowsToItemsArray(rows) : null;
+  };
+
+  if (concurrent) {
+    let db = await PlacesUtils.promiseDBConnection();
+    return query(db);
+  }
+  return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: fetchBookmarksByTags",
+                                           query);
+}
+
 async function fetchBookmarksByGUIDPrefix(info, concurrent) {
   let query = async function(db) {
     let rows = await db.executeCached(
diff --git a/toolkit/components/places/PlacesTransactions.jsm b/toolkit/components/places/PlacesTransactions.jsm
index 27286a79e07f..ea0a9c006461 100644
--- a/toolkit/components/places/PlacesTransactions.jsm
+++ b/toolkit/components/places/PlacesTransactions.jsm
@@ -1597,8 +1597,10 @@ PT.RenameTag.prototype = {
     // For now this is implemented by untagging and tagging all the bookmarks.
     // We should create a specialized bookmarking API to just rename the tag.
     let onUndo = [], onRedo = [];
-    let urls = PlacesUtils.tagging.getURIsForTag(oldTag);
-    if (urls.length > 0) {
+    let urls = new Set();
+    await PlacesUtils.bookmarks.fetch({tags: [oldTag]}, b => urls.add(b.url));
+    if (urls.size > 0) {
+      urls = Array.from(urls);
       let tagTxn = TransactionsHistory.getRawTransaction(
         PT.Tag({ urls, tags: [tag] })
       );
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index 7992e46b2004..6365216f9c49 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -252,7 +252,8 @@ const BOOKMARK_VALIDATORS = Object.freeze({
   keyword: simpleValidateFunc(v => (typeof(v) == "string") && v.length),
   charset: simpleValidateFunc(v => (typeof(v) == "string") && v.length),
   postData: simpleValidateFunc(v => (typeof(v) == "string") && v.length),
-  tags: simpleValidateFunc(v => Array.isArray(v) && v.length),
+  tags: simpleValidateFunc(v => Array.isArray(v) && v.length &&
+                                v.every(item => item && typeof item == "string")),
 });
 
 // Sync bookmark records can contain additional properties.
diff --git a/toolkit/components/places/nsITaggingService.idl b/toolkit/components/places/nsITaggingService.idl
index d72cc7206cd4..c6eddd81f109 100644
--- a/toolkit/components/places/nsITaggingService.idl
+++ b/toolkit/components/places/nsITaggingService.idl
@@ -48,15 +48,6 @@ interface nsITaggingService : nsISupports
                 in nsIVariant aTags,
                 [optional] in unsigned short aSource);
 
-  /**
-   * Retrieves all URLs tagged with the given tag.
-   *
-   * @param aTag
-   *        tag name
-   * @returns Array of uris tagged with aTag.
-   */
-  nsIVariant getURIsForTag(in AString aTag);
-
   /**
    * Retrieves all tags set for the given URL.
    *
diff --git a/toolkit/components/places/nsTaggingService.js b/toolkit/components/places/nsTaggingService.js
index 8bfa1a69472d..2889c2833c7e 100644
--- a/toolkit/components/places/nsTaggingService.js
+++ b/toolkit/components/places/nsTaggingService.js
@@ -229,42 +229,6 @@ TaggingService.prototype = {
     }
   },
 
-  // nsITaggingService
-  getURIsForTag: function TS_getURIsForTag(aTagName) {
-    if (!aTagName || aTagName.length == 0) {
-      throw Components.Exception("Invalid tag name", Cr.NS_ERROR_INVALID_ARG);
-    }
-
-    if (/^\s|\s$/.test(aTagName)) {
-      throw Components.Exception("Tag passed to getURIsForTag was not trimmed",
-                                 Cr.NS_ERROR_INVALID_ARG);
-    }
-
-    let uris = [];
-    let tagId = this._getItemIdForTag(aTagName);
-    if (tagId == -1)
-      return uris;
-
-    let db = PlacesUtils.history.DBConnection;
-    let stmt = db.createStatement(
-      `SELECT h.url FROM moz_places h
-       JOIN moz_bookmarks b ON b.fk = h.id
-       WHERE b.parent = :tag_id`
-    );
-    stmt.params.tag_id = tagId;
-    try {
-      while (stmt.executeStep()) {
-        try {
-          uris.push(Services.io.newURI(stmt.row.url));
-        } catch (ex) {}
-      }
-    } finally {
-      stmt.finalize();
-    }
-
-    return uris;
-  },
-
   // nsITaggingService
   getTagsForURI: function TS_getTagsForURI(aURI, aCount) {
     if (!aURI) {
diff --git a/toolkit/components/places/tests/bookmarks/test_tags.js b/toolkit/components/places/tests/bookmarks/test_tags.js
index bd35f77de566..2c8e601c39cc 100644
--- a/toolkit/components/places/tests/bookmarks/test_tags.js
+++ b/toolkit/components/places/tests/bookmarks/test_tags.js
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function() {
+add_task(async function test_fetchTags() {
   let tags = await PlacesUtils.bookmarks.fetchTags();
   Assert.deepEqual(tags, []);
 
@@ -34,3 +34,55 @@ add_task(async function() {
     { name: "3", count: 1 },
   ]);
 });
+
+add_task(async function test_fetch_by_tags() {
+  Assert.throws(() => PlacesUtils.bookmarks.fetch({ tags: "" }),
+                /Invalid value for property 'tags'/);
+  Assert.throws(() => PlacesUtils.bookmarks.fetch({ tags: [] }),
+                /Invalid value for property 'tags'/);
+  Assert.throws(() => PlacesUtils.bookmarks.fetch({ tags: null }),
+                /Invalid value for property 'tags'/);
+  Assert.throws(() => PlacesUtils.bookmarks.fetch({ tags: [""] }),
+                /Invalid value for property 'tags'/);
+  Assert.throws(() => PlacesUtils.bookmarks.fetch({ tags: ["valid", null] }),
+                /Invalid value for property 'tags'/);
+
+  info("Add bookmarks with tags.");
+  let bm1 = await PlacesUtils.bookmarks.insert({
+    url: "http://bacon.org/",
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+  });
+  PlacesUtils.tagging.tagURI(Services.io.newURI(bm1.url.href), ["egg", "ratafià"]);
+  let bm2 = await PlacesUtils.bookmarks.insert({
+    url: "http://mushroom.org/",
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+  });
+  PlacesUtils.tagging.tagURI(Services.io.newURI(bm2.url.href), ["egg"]);
+
+  info("Fetch a single tag.");
+  let bms = [];
+  Assert.equal((await PlacesUtils.bookmarks.fetch({tags: ["egg"]}, b => bms.push(b))).guid,
+               bm2.guid, "Found the expected recent bookmark");
+  Assert.deepEqual(bms.map(b => b.guid), [bm2.guid, bm1.guid],
+                   "Found the expected bookmarks");
+
+  info("Fetch multiple tags.");
+  bms = [];
+  Assert.equal((await PlacesUtils.bookmarks.fetch({tags: ["egg", "ratafià"]}, b => bms.push(b))).guid,
+               bm1.guid, "Found the expected recent bookmark");
+  Assert.deepEqual(bms.map(b => b.guid), [bm1.guid],
+                   "Found the expected bookmarks");
+
+  info("Fetch a nonexisting tag.");
+  bms = [];
+  Assert.equal(await PlacesUtils.bookmarks.fetch({tags: ["egg", "tomato"]}, b => bms.push(b)),
+               null, "Should not find any bookmark");
+  Assert.deepEqual(bms, [], "Should not find any bookmark");
+
+  info("Check case insensitive");
+  bms = [];
+  Assert.equal((await PlacesUtils.bookmarks.fetch({tags: ["eGg", "raTafiÀ"]}, b => bms.push(b))).guid,
+               bm1.guid, "Found the expected recent bookmark");
+  Assert.deepEqual(bms.map(b => b.guid), [bm1.guid],
+                   "Found the expected bookmarks");
+});
diff --git a/toolkit/components/places/tests/sync/test_bookmark_value_changes.js b/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
index 565045c47607..3783c8a386a4 100644
--- a/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
+++ b/toolkit/components/places/tests/sync/test_bookmark_value_changes.js
@@ -961,12 +961,12 @@ add_task(async function test_rewrite_tag_queries() {
 
   deepEqual(changesToUpload, {}, "Should not reupload any local records");
 
-  let urisWithTaggy = PlacesUtils.tagging.getURIsForTag("taggy");
-  deepEqual(urisWithTaggy.map(uri => uri.spec).sort(), ["http://example.com/e"],
+  let bmWithTaggy = await PlacesUtils.bookmarks.fetch({tags: ["taggy"]});
+  equal(bmWithTaggy.url.href, "http://example.com/e",
     "Should insert bookmark with new tag");
 
-  let urisWithKitty = PlacesUtils.tagging.getURIsForTag("kitty");
-  deepEqual(urisWithKitty.map(uri => uri.spec).sort(), ["http://example.com/d"],
+  let bmWithKitty = await PlacesUtils.bookmarks.fetch({tags: ["kitty"]});
+  equal(bmWithKitty.url.href, "http://example.com/d",
     "Should retain existing tag");
 
   let { root: toolbarContainer } = PlacesUtils.getFolderContents(
diff --git a/toolkit/components/places/tests/sync/test_sync_utils.js b/toolkit/components/places/tests/sync/test_sync_utils.js
index 762d6af1f8b7..24655f351b29 100644
--- a/toolkit/components/places/tests/sync/test_sync_utils.js
+++ b/toolkit/components/places/tests/sync/test_sync_utils.js
@@ -37,9 +37,11 @@ function shuffle(array) {
   return results;
 }
 
-function assertTagForURLs(tag, urls, message) {
-  let taggedURLs = PlacesUtils.tagging.getURIsForTag(tag).map(uri => uri.spec);
-  deepEqual(taggedURLs.sort(compareAscending), urls.sort(compareAscending), message);
+async function assertTagForURLs(tag, urls, message) {
+  let taggedURLs = new Set();
+  await PlacesUtils.bookmarks.fetch({tags: [tag]}, b => taggedURLs.add(b.url.href));
+  deepEqual(Array.from(taggedURLs).sort(compareAscending),
+            urls.sort(compareAscending), message);
 }
 
 function assertURLHasTags(url, tags, message) {
@@ -581,7 +583,7 @@ add_task(async function test_update_tags() {
     deepEqual(updatedItem.tags, ["foo", "baz"], "Should return updated tags");
     assertURLHasTags("https://mozilla.org", ["baz", "foo"],
       "Should update tags for URL");
-    assertTagForURLs("bar", [], "Should remove existing tag");
+    await assertTagForURLs("bar", [], "Should remove existing tag");
   }
 
   info("Tags with whitespace");
@@ -666,7 +668,7 @@ add_task(async function test_pullChanges_tags() {
     deepEqual(Object.keys(changes).sort(),
       [firstItem.recordId, secondItem.recordId, taggedItem.recordId].sort(),
       "Should include tagged bookmarks after changing case");
-    assertTagForURLs("TaGgY", ["https://example.org/", "https://mozilla.org/"],
+    await assertTagForURLs("TaGgY", ["https://example.org/", "https://mozilla.org/"],
       "Should add tag for new URL");
     await setChangesSynced(changes);
   }
@@ -715,17 +717,17 @@ add_task(async function test_pullChanges_tags() {
     deepEqual(Object.keys(changes).sort(),
       [firstItem.recordId, secondItem.recordId, untaggedItem.recordId].sort(),
       "Should include tagged bookmarks after changing tag entry URI");
-    assertTagForURLs("tricky", ["https://bugzilla.org/", "https://mozilla.org/"],
+    await assertTagForURLs("tricky", ["https://bugzilla.org/", "https://mozilla.org/"],
       "Should remove tag entry for old URI");
     await setChangesSynced(changes);
 
-    bm.url = "https://example.com/";
+    bm.url = "https://example.org/";
     await PlacesUtils.bookmarks.update(bm);
     changes = await PlacesSyncUtils.bookmarks.pullChanges();
     deepEqual(Object.keys(changes).sort(),
-      [untaggedItem.recordId].sort(),
+      [firstItem.recordId, secondItem.recordId, untaggedItem.recordId].sort(),
       "Should include tagged bookmarks after changing tag entry URL");
-    assertTagForURLs("tricky", ["https://example.com/", "https://mozilla.org/"],
+    await assertTagForURLs("tricky", ["https://example.org/", "https://mozilla.org/"],
       "Should remove tag entry for old URL");
     await setChangesSynced(changes);
   }
@@ -1313,13 +1315,13 @@ add_task(async function test_insert_tags() {
     title: "bar",
   }].map(info => PlacesSyncUtils.bookmarks.insert(info)));
 
-  assertTagForURLs("foo", ["https://example.com/", "https://example.org/"],
+  await assertTagForURLs("foo", ["https://example.com/", "https://example.org/"],
     "2 URLs with new tag");
-  assertTagForURLs("bar", ["https://example.com/"], "1 URL with existing tag");
-  assertTagForURLs("baz", ["https://example.org/",
+  await assertTagForURLs("bar", ["https://example.com/"], "1 URL with existing tag");
+  await assertTagForURLs("baz", ["https://example.org/",
     "place:queryType=1&sort=12&maxResults=10"],
     "Should support tagging URLs and tag queries");
-  assertTagForURLs("qux", ["place:queryType=1&sort=12&maxResults=10"],
+  await assertTagForURLs("qux", ["place:queryType=1&sort=12&maxResults=10"],
     "Should support tagging tag queries");
 
   await PlacesUtils.bookmarks.eraseEverything();
@@ -1353,7 +1355,7 @@ add_task(async function test_insert_tags_whitespace() {
   assertURLHasTags("https://example.net/", ["taggy"],
     "Should ignore dupes when setting tags");
 
-  assertTagForURLs("taggy", ["https://example.net/", "https://example.org/"],
+  await assertTagForURLs("taggy", ["https://example.net/", "https://example.org/"],
     "Should exclude falsy tags");
 
   PlacesUtils.tagging.untagURI(uri("https://example.org"), ["untrimmed", "taggy"]);
diff --git a/toolkit/components/places/tests/unit/test_tagging.js b/toolkit/components/places/tests/unit/test_tagging.js
index 4188b12918e6..1dbaad32d4b0 100644
--- a/toolkit/components/places/tests/unit/test_tagging.js
+++ b/toolkit/components/places/tests/unit/test_tagging.js
@@ -58,12 +58,6 @@ function run_test() {
   Assert.equal(uri2tags.length, 1);
   Assert.equal(uri2tags[0], "Tag 1");
 
-  // test getURIsForTag
-  var tag1uris = tagssvc.getURIsForTag("tag 1");
-  Assert.equal(tag1uris.length, 2);
-  Assert.ok(tag1uris[0].equals(uri1));
-  Assert.ok(tag1uris[1].equals(uri2));
-
   // test untagging
   tagssvc.untagURI(uri1, ["tag 1"]);
   Assert.equal(tag1node.childCount, 1);

From b56813230a576dd2f33a86043d3fa0bfb6e427ca Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Mon, 16 Jul 2018 21:16:50 +0100
Subject: [PATCH 13/29] Bug 1466881 - Missing open events for some users
 r=nchevobbe

Changes:

- All files
  - Generally shuffled around telemetry events to fix issues with properties not been sent or being sent in the wrong order.
- devtools/client/framework/browser-menus.js
  - Added telemetry open event to missed codepath.
- devtools/startup/DevToolsShim.jsm
  - Added missing telemetry "shortcut" property.
- devtools/startup/devtools-startup.js
  - Added comment to sendEntryPointTelemetry().

MozReview-Commit-ID: ELldeyF32rG

--HG--
extra : rebase_source : bbe9a9bf279e6a6c1324a162885cc35b04cf27ce
---
 .../browser_dbg-browser-content-toolbox.js    |  4 +-
 devtools/client/framework/browser-menus.js    | 24 +++++++++
 devtools/client/framework/devtools.js         | 21 +++++---
 devtools/client/framework/toolbox.js          | 54 ++++++++++---------
 devtools/startup/DevToolsShim.jsm             |  3 ++
 devtools/startup/devtools-startup.js          | 12 +++++
 6 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js
index 0b1bc07ba0d5..a050084c0d60 100644
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-browser-content-toolbox.js
@@ -49,8 +49,8 @@ add_task(async function() {
   info("Open the Browser Content Toolbox");
   let toolbox = await gDevToolsBrowser.openContentProcessToolbox(gBrowser);
 
-  info("Wait for the debugger to be ready");
-  await toolbox.getPanelWhenReady("jsdebugger");
+  info("Select the debugger");
+  await toolbox.selectTool("jsdebugger");
 
   let dbg = createDebuggerContext(toolbox);
   ok(dbg, "Debugger context is available");
diff --git a/devtools/client/framework/browser-menus.js b/devtools/client/framework/browser-menus.js
index 487fcaceec76..16c3c3a13da1 100644
--- a/devtools/client/framework/browser-menus.js
+++ b/devtools/client/framework/browser-menus.js
@@ -18,6 +18,9 @@ const MENUS_L10N = new LocalizationHelper("devtools/client/locales/menus.propert
 
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
+loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+
+let telemetry = null;
 
 // Keep list of inserted DOM Elements in order to remove them on unload
 // Maps browser xul document => list of DOM Elements
@@ -78,6 +81,7 @@ function createToolMenuElements(toolDefinition, doc) {
   const oncommand = function(id, event) {
     const window = event.target.ownerDocument.defaultView;
     gDevToolsBrowser.selectToolCommand(window.gBrowser, id, Cu.now());
+    sendEntryPointTelemetry();
   }.bind(null, id);
 
   const menuitem = createMenuItem({
@@ -96,6 +100,26 @@ function createToolMenuElements(toolDefinition, doc) {
   };
 }
 
+/**
+ * Send entry point telemetry explaining how the devtools were launched when
+ * launched from the System Menu.. This functionality also lives inside
+ * `devtools/startup/devtools-startup.js` but that codepath is only used the
+ * first time a toolbox is opened for a tab.
+ */
+function sendEntryPointTelemetry() {
+  if (!telemetry) {
+    telemetry = new Telemetry();
+  }
+
+  telemetry.addEventProperty(
+    "devtools.main", "open", "tools", null, "shortcut", ""
+  );
+
+  telemetry.addEventProperty(
+    "devtools.main", "open", "tools", null, "entrypoint", "SystemMenu"
+  );
+}
+
 /**
  * Create xul menuitem, key elements for a given tool.
  * And then insert them into browser DOM.
diff --git a/devtools/client/framework/devtools.js b/devtools/client/framework/devtools.js
index a6388365aa45..8eaac0bc25c9 100644
--- a/devtools/client/framework/devtools.js
+++ b/devtools/client/framework/devtools.js
@@ -453,6 +453,7 @@ DevTools.prototype = {
    */
   async showToolbox(target, toolId, hostType, hostOptions, startTime) {
     let toolbox = this._toolboxes.get(target);
+
     if (toolbox) {
       if (hostType != null && toolbox.hostType != hostType) {
         await toolbox.switchHost(hostType);
@@ -477,14 +478,18 @@ DevTools.prototype = {
       this._creatingToolboxes.delete(target);
 
       if (startTime) {
-        this.logToolboxOpenTime(toolbox.currentToolId, startTime);
+        this.logToolboxOpenTime(toolbox, startTime);
       }
       this._firstShowToolbox = false;
     }
 
+    // We send the "enter" width here to ensure it is always sent *after*
+    // the "open" event.
     const width = Math.ceil(toolbox.win.outerWidth / 50) * 50;
+    const panelName = this.makeToolIdHumanReadable(toolId || toolbox.defaultToolId);
     this._telemetry.addEventProperty(
-      "devtools.main", "open", "tools", null, "width", width);
+      "devtools.main", "enter", panelName, null, "width", width
+    );
 
     return toolbox;
   },
@@ -496,22 +501,24 @@ DevTools.prototype = {
    * subsequent toolbox opening, which should all be faster.
    * These two probes are indexed by Tool ID.
    *
-   * @param {String} toolId
-   *        The id of the opened tool.
+   * @param {String} toolbox
+   *        Toolbox instance.
    * @param {Number} startTime
    *        Indicates the time at which the user event related to the toolbox
    *        opening started. This is a `Cu.now()` timing.
    */
-  logToolboxOpenTime(toolId, startTime) {
+  logToolboxOpenTime(toolbox, startTime) {
+    const toolId = toolbox.currentToolId || toolbox.defaultToolId;
     const delay = Cu.now() - startTime;
+    const panelName = this.makeToolIdHumanReadable(toolId);
 
     const telemetryKey = this._firstShowToolbox ?
       "DEVTOOLS_COLD_TOOLBOX_OPEN_DELAY_MS" : "DEVTOOLS_WARM_TOOLBOX_OPEN_DELAY_MS";
     this._telemetry.getKeyedHistogramById(telemetryKey).add(toolId, delay);
 
     this._telemetry.addEventProperty(
-      "devtools.main", "open", "tools", null, "first_panel",
-      this.makeToolIdHumanReadable(toolId));
+      "devtools.main", "open", "tools", null, "first_panel", panelName
+    );
   },
 
   makeToolIdHumanReadable(toolId) {
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 83f958b12967..a061e7ba4d16 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -244,6 +244,10 @@ Toolbox.prototype = {
     this.component.setCurrentToolId(id);
   },
 
+  get defaultToolId() {
+    return this._defaultToolId;
+  },
+
   get panelDefinitions() {
     return this._panelDefinitions;
   },
@@ -1901,15 +1905,7 @@ Toolbox.prototype = {
     const panelName = this.getTelemetryPanelNameOrOther(id);
     const prevPanelName = this.getTelemetryPanelNameOrOther(this.currentToolId);
     const cold = !this.getPanel(id);
-
-    this.telemetry.addEventProperties("devtools.main", "enter", panelName, null, {
-      "host": this._hostType,
-      "width": width,
-      "start_state": reason,
-      "panel_name": panelName,
-      "cold": cold,
-      // "session_id" is included at the end of this method.
-    });
+    const pending = ["host", "width", "start_state", "panel_name", "cold", "session_id"];
 
     // On first load this.currentToolId === undefined so we need to skip sending
     // a devtools.main.exit telemetry event.
@@ -1924,13 +1920,32 @@ Toolbox.prototype = {
       });
     }
 
-    const pending = ["host", "width", "start_state", "panel_name", "cold", "session_id"];
+    this.telemetry.addEventProperties("devtools.main", "open", "tools", null, {
+      "width": width,
+      "session_id": this.sessionId
+    });
+
     if (id === "webconsole") {
       pending.push("message_count");
     }
 
     this.telemetry.preparePendingEvent("devtools.main", "enter", panelName, null, pending);
 
+    this.telemetry.addEventProperties("devtools.main", "enter", panelName, null, {
+      "host": this._hostType,
+      "start_state": reason,
+      "panel_name": panelName,
+      "cold": cold,
+      "session_id": this.sessionId
+    });
+
+    if (reason !== "initial_panel") {
+      const width = Math.ceil(this.win.outerWidth / 50) * 50;
+      this.telemetry.addEventProperty(
+        "devtools.main", "enter", panelName, null, "width", width
+      );
+    }
+
     // Cold webconsole event message_count is handled in
     // devtools/client/webconsole/webconsole-output-wrapper.js
     if (!cold && id === "webconsole") {
@@ -1938,15 +1953,6 @@ Toolbox.prototype = {
         "devtools.main", "enter", "webconsole", null, "message_count", 0);
     }
 
-    this.telemetry.addEventProperty(
-      "devtools.main", "open", "tools", null, "session_id", this.sessionId
-    );
-    // We send the "enter" session ID here to ensure it is always sent *after*
-    // the "open" session ID.
-    this.telemetry.addEventProperty(
-      "devtools.main", "enter", panelName, null, "session_id", this.sessionId
-    );
-
     this.telemetry.toolOpened(id);
   },
 
@@ -2963,11 +2969,6 @@ Toolbox.prototype = {
     const prevPanelName = this.getTelemetryPanelNameOrOther(this.currentToolId);
 
     this.telemetry.toolClosed("toolbox");
-    this.telemetry.recordEvent("devtools.main", "close", "tools", null, {
-      "host": host,
-      "width": width,
-      "session_id": this.sessionId
-    });
     this.telemetry.recordEvent("devtools.main", "exit", prevPanelName, null, {
       "host": host,
       "width": width,
@@ -2976,6 +2977,11 @@ Toolbox.prototype = {
       "reason": "toolbox_close",
       "session_id": this.sessionId
     });
+    this.telemetry.recordEvent("devtools.main", "close", "tools", null, {
+      "host": host,
+      "width": width,
+      "session_id": this.sessionId
+    });
 
     // Finish all outstanding tasks (which means finish destroying panels and
     // then destroying the host, successfully or not) before destroying the
diff --git a/devtools/startup/DevToolsShim.jsm b/devtools/startup/DevToolsShim.jsm
index e3c8d8f10532..389cf910c2d1 100644
--- a/devtools/startup/DevToolsShim.jsm
+++ b/devtools/startup/DevToolsShim.jsm
@@ -263,6 +263,9 @@ this.DevToolsShim = {
     }
 
     if (reason) {
+      this.telemetry.addEventProperty(
+        "devtools.main", "open", "tools", null, "shortcut", ""
+      );
       this.telemetry.addEventProperty(
         "devtools.main", "open", "tools", null, "entrypoint", reason
       );
diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-startup.js
index 6787773014b2..f9b1e3cff8cc 100644
--- a/devtools/startup/devtools-startup.js
+++ b/devtools/startup/devtools-startup.js
@@ -841,6 +841,18 @@ DevToolsStartup.prototype = {
     }
   },
 
+  /**
+   * Send entry point telemetry explaining how the devtools were launched. This
+   * functionality also lives inside `devtools/client/framework/browser-menus.js`
+   * because this codepath is only used the first time a toolbox is opened for a
+   * tab.
+   *
+   * @param {String} reason
+   *        One of "KeyShortcut", "SystemMenu", "HamburgerMenu", "ContextMenu",
+   *        "CommandLine".
+   * @param {String} key
+   *        The key used by a key shortcut.
+   */
   sendEntryPointTelemetry(reason, key = "") {
     if (!reason) {
       return;

From 9eb40b478a4dd130b8c2868f02ec69bd805f613f Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Thu, 26 Jul 2018 08:22:18 +0200
Subject: [PATCH 14/29] Bug 1463101 - Add a jump_to_definition telemetry probe;
 r=miker.

This probe will log each click on the 'jump to definition' icon
that can be visible next to logged function in the webconsole.
The actual recording will be added in github (See the following
issue: https://github.com/devtools-html/debugger.html/issues/6703).
MozReview-Commit-ID: ALO3w9jvt5n

--HG--
extra : rebase_source : 26462b0bff438b8fccd188ee3bf9f1adf9156bbf
---
 toolkit/components/telemetry/Events.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/toolkit/components/telemetry/Events.yaml b/toolkit/components/telemetry/Events.yaml
index 3c4ec2c2136f..01ca26c6cca3 100644
--- a/toolkit/components/telemetry/Events.yaml
+++ b/toolkit/components/telemetry/Events.yaml
@@ -642,4 +642,14 @@ devtools.main:
       trigger: "The cause of the filter change: error, warn, log, info, debug, css, netxhr, net, text or reset"
       active: Comma separated list of active filters.
       inactive: Comma separated list of inactive filters.
+      session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
+  jump_to_definition:
+    objects: ["webconsole"]
+    bug_numbers: [1463101]
+    notification_emails: ["dev-developer-tools@lists.mozilla.org", "hkirschner@mozilla.com"]
+    record_in_processes: ["main"]
+    description: User has clicked "Jump to definition" icon (next to logged functions) in the web console.
+    release_channel_collection: opt-out
+    expiry_version: never
+    extra_keys:
       session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
\ No newline at end of file

From c70099b77d2ad6911b0466c55002eb4f1bf089c0 Mon Sep 17 00:00:00 2001
From: Rob Wood <rwood@mozilla.com>
Date: Fri, 27 Jul 2018 11:10:30 -0400
Subject: [PATCH 15/29] Bug 1478057 - Report the mean of all measurements per
 pageload, not separate values per measurement type; r=igoldan

MozReview-Commit-ID: H0lYbZPFzMY

--HG--
extra : rebase_source : bcb5b801eeec0a585f49f9e4e638beecdd1ee7e2
---
 testing/raptor/raptor/output.py              | 30 +++++++++++++-------
 testing/raptor/raptor/tests/raptor-gdocs.ini | 18 ++++++++----
 testing/raptor/raptor/tests/raptor-tp6.ini   | 24 ++++++++++------
 3 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/testing/raptor/raptor/output.py b/testing/raptor/raptor/output.py
index b7db88896936..ad0375ddbc7e 100644
--- a/testing/raptor/raptor/output.py
+++ b/testing/raptor/raptor/output.py
@@ -30,7 +30,6 @@ class Output(object):
 
     def summarize(self):
         suites = []
-        vals = []
         test_results = {
             'framework': {
                 'name': 'raptor',
@@ -44,6 +43,7 @@ class Output(object):
             return
 
         for test in self.results:
+            vals = []
             subtests = []
             suite = {
                 'name': test.name,
@@ -71,10 +71,10 @@ class Output(object):
                 # u'https://www.amazon.com/s/url=search-alias%3Daps&field-keywords=laptop',
                 # u'unit': u'ms', u'alert_threshold': 2}
 
-                for key, values in test.measurements.iteritems():
+                for measurement_name, replicates in test.measurements.iteritems():
                     new_subtest = {}
-                    new_subtest['name'] = test.name + "-" + key
-                    new_subtest['replicates'] = values
+                    new_subtest['name'] = test.name + "-" + measurement_name
+                    new_subtest['replicates'] = replicates
                     new_subtest['lowerIsBetter'] = test.lower_is_better
                     new_subtest['alertThreshold'] = float(test.alert_threshold)
                     new_subtest['value'] = 0
@@ -82,8 +82,8 @@ class Output(object):
 
                     filtered_values = filter.ignore_first(new_subtest['replicates'], 1)
                     new_subtest['value'] = filter.median(filtered_values)
-                    vals.append(new_subtest['value'])
 
+                    vals.append([new_subtest['value'], new_subtest['name']])
                     subtests.append(new_subtest)
 
             elif test.type == "benchmark":
@@ -97,14 +97,22 @@ class Output(object):
                     subtests, vals = self.parseWebaudioOutput(test)
                 suite['subtests'] = subtests
 
-                # if there is more than one subtest, calculate a summary result
-                if len(subtests) > 1:
-                    suite['value'] = self.construct_summary(vals, testname=test.name)
-
             else:
                 LOG.error("output.summarize received unsupported test results type")
                 return
 
+            # for pageload tests, if there are > 1 subtests here, that means there
+            # were multiple measurements captured in each single pageload; we want
+            # to get the mean of those values and report 1 overall 'suite' value
+            # for the page; so that each test page/URL only has 1 line output
+            # on treeherder/perfherder (all replicates available in the JSON)
+
+            # for benchmarks there is generally  more than one subtest in each cycle
+            # and a benchmark-specific formula is needed to calculate the final score
+
+            if len(subtests) > 1:
+                suite['value'] = self.construct_summary(vals, testname=test.name)
+
         self.summarized_results = test_results
 
     def parseSpeedometerOutput(self, test):
@@ -401,6 +409,6 @@ class Output(object):
         elif testname.startswith('raptor-webaudio'):
             return self.webaudio_score(vals)
         elif len(vals) > 1:
-            return filter.geometric_mean([i for i, j in vals])
+            return round(filter.geometric_mean([i for i, j in vals]), 2)
         else:
-            return filter.mean([i for i, j in vals])
+            return round(filter.mean([i for i, j in vals]), 2)
diff --git a/testing/raptor/raptor/tests/raptor-gdocs.ini b/testing/raptor/raptor/tests/raptor-gdocs.ini
index 4b458ec34644..661c38636829 100644
--- a/testing/raptor/raptor/tests/raptor-gdocs.ini
+++ b/testing/raptor/raptor/tests/raptor-gdocs.ini
@@ -20,34 +20,40 @@ page_timeout = 30000
 apps = firefox
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
 playback_recordings = google-docs.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-google-sheets-firefox]
 apps = firefox
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
 playback_recordings = google-sheets.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-google-slides-firefox]
 apps = firefox
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
 playback_recordings = google-slides.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-google-docs-chrome]
 apps = chrome
 test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing
 playback_recordings = google-docs.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
 
 [raptor-google-sheets-chrome]
 apps = chrome
 test_url = https://docs.google.com/spreadsheets/d/1jT9qfZFAeqNoOK97gruc34Zb7y_Q-O_drZ8kSXT-4D4/edit?usp=sharing
 playback_recordings = google-sheets.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
 
 [raptor-google-slides-chrome]
 apps = chrome
 test_url = https://docs.google.com/presentation/d/1Ici0ceWwpFvmIb3EmKeWSq_vAQdmmdFcWqaiLqUkJng/edit?usp=sharing
 playback_recordings = google-slides.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
diff --git a/testing/raptor/raptor/tests/raptor-tp6.ini b/testing/raptor/raptor/tests/raptor-tp6.ini
index d0a480e1f0b8..693668928c19 100644
--- a/testing/raptor/raptor/tests/raptor-tp6.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6.ini
@@ -19,13 +19,15 @@ alert_threshold = 2.0
 apps = firefox
 test_url = https://www.amazon.com/s/url=search-alias%3Daps&field-keywords=laptop
 playback_recordings = amazon.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-tp6-facebook-firefox]
 apps = firefox
 test_url = https://www.facebook.com
 playback_recordings = facebook.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-tp6-google-firefox]
 apps = firefox
@@ -34,34 +36,40 @@ apps = firefox
 # to be loaded into that page also; resulting in 2 fnbpaint values etc.
 test_url = https://www.google.com/search?hl=en&q=barack+obama&cad=h
 playback_recordings = google-search.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-tp6-youtube-firefox]
 apps = firefox
 test_url = https://www.youtube.com
 playback_recordings = youtube.mp
-measure = fnbpaint
+measure = fnbpaint, hero
+hero = hero1
 
 [raptor-tp6-amazon-chrome]
 apps = chrome
 test_url = https://www.amazon.com/s/url=search-alias%3Daps&field-keywords=laptop
 playback_recordings = amazon.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
 
 [raptor-tp6-facebook-chrome]
 apps = chrome
 test_url = https://www.facebook.com
 playback_recordings = facebook.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
 
 [raptor-tp6-google-chrome]
 apps = chrome
 test_url = https://www.google.com/#hl=en&q=barack+obama
 playback_recordings = google-search.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1
 
 [raptor-tp6-youtube-chrome]
 apps = chrome
 test_url = https://www.youtube.com
 playback_recordings = youtube.mp
-measure = fcp
+measure = fcp, hero
+hero = hero1

From 689a6cf8a203a1e78afb4dc6dc9f012049bc3776 Mon Sep 17 00:00:00 2001
From: Mark Striemer <mstriemer@mozilla.com>
Date: Mon, 23 Jul 2018 14:16:37 -0500
Subject: [PATCH 16/29] Bug 1477793 - Show hidden audio tabs after Hidden Tabs
 r=dao

MozReview-Commit-ID: Ce9PLLx3UnB

--HG--
extra : rebase_source : 626a67c021eafa7e0ba5e1022d52d19f1acdf157
---
 browser/base/content/browser-allTabsMenu.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/browser-allTabsMenu.js b/browser/base/content/browser-allTabsMenu.js
index f65624af3ae0..f3e5d831e9cc 100644
--- a/browser/base/content/browser-allTabsMenu.js
+++ b/browser/base/content/browser-allTabsMenu.js
@@ -34,11 +34,9 @@ var gTabsPanel = {
 
     this.initElements();
 
-    let hiddenTabsMenuButton = document.getElementById("allTabsMenu-hiddenTabsButton");
-    let hiddenTabsSeparator = document.getElementById("allTabsMenu-hiddenTabsSeparator");
     this.hiddenAudioTabsPopup = new TabsPanel({
       view: this.allTabsView,
-      insertBefore: hiddenTabsSeparator,
+      insertBefore: document.getElementById("allTabsMenu-tabsSeparator"),
       filterFn: (tab) => tab.hidden && tab.soundPlaying,
     });
     this.allTabsPanel = new TabsPanel({
@@ -47,8 +45,6 @@ var gTabsPanel = {
       filterFn: (tab) => !tab.pinned && !tab.hidden,
     });
 
-    let containerTabsButton = document.getElementById("allTabsMenu-containerTabsButton");
-    let containerTabsSeparator = document.getElementById("allTabsMenu-containerTabsSeparator");
     this.allTabsView.addEventListener("ViewShowing", (e) => {
       PanelUI._ensureShortcutsShown(this.allTabsView);
       e.target.querySelector(".undo-close-tab").disabled =
@@ -56,12 +52,16 @@ var gTabsPanel = {
 
       let containersEnabled = Services.prefs.getBoolPref("privacy.userContext.enabled")
                                 && !PrivateBrowsingUtils.isWindowPrivate(window);
-      containerTabsButton.hidden = !containersEnabled;
-      containerTabsSeparator.hidden = !containersEnabled;
+      document.getElementById("allTabsMenu-containerTabsButton")
+        .hidden = !containersEnabled;
+      document.getElementById("allTabsMenu-containerTabsSeparator")
+        .hidden = !containersEnabled;
 
       let hasHiddenTabs = gBrowser.visibleTabs.length < gBrowser.tabs.length;
-      hiddenTabsMenuButton.hidden = !hasHiddenTabs;
-      hiddenTabsSeparator.hidden = !hasHiddenTabs;
+      document.getElementById("allTabsMenu-hiddenTabsButton")
+        .hidden = !hasHiddenTabs;
+      document.getElementById("allTabsMenu-hiddenTabsSeparator")
+        .hidden = !hasHiddenTabs;
     });
 
     this.allTabsView.addEventListener("ViewShown", (e) => {

From 58530943267150512b627a08e2b8dc528feb10a6 Mon Sep 17 00:00:00 2001
From: Ryan Hunt <rhunt@eqrion.net>
Date: Tue, 24 Jul 2018 16:19:04 -0500
Subject: [PATCH 17/29] Bug 1476724 - Mark default-style/button.html as fuzzy
 on debug linux. r=jrmuizel

MozReview-Commit-ID: CEhtvTB0VXa

--HG--
extra : rebase_source : 30eb9731c96e609ea529eebcf7d376e4e380723b
---
 layout/reftests/css-invalid/default-style/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/css-invalid/default-style/reftest.list b/layout/reftests/css-invalid/default-style/reftest.list
index 3ce4650a6b63..fb6a70859b5c 100644
--- a/layout/reftests/css-invalid/default-style/reftest.list
+++ b/layout/reftests/css-invalid/default-style/reftest.list
@@ -1,5 +1,5 @@
 == input.html input-ref.html
-== button.html button-ref.html
+fuzzy-if(isDebugBuild&&gtkWidget,1,1) == button.html button-ref.html
 == textarea.html textarea-ref.html
 == select.html select-ref.html
 == fieldset.html fieldset-ref.html

From 52897f4c3aac6ebe9d0261e73087a88339064121 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Fri, 27 Jul 2018 16:22:26 +0000
Subject: [PATCH 18/29] Bug 1478810 - [mozharness] Remove the unused 'mozbase'
 suite from desktop_unittest.py r=gbrown

There are no instances of --mozbase-suite in either m-c or c-c, which proves this is unused.

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

--HG--
extra : moz-landing-system : lando
---
 .../mozharness/configs/unittests/linux_unittest.py  | 13 -------------
 .../mozharness/configs/unittests/mac_unittest.py    | 13 -------------
 .../configs/unittests/win_taskcluster_unittest.py   | 12 ------------
 .../mozharness/configs/unittests/win_unittest.py    | 13 -------------
 testing/mozharness/mach_commands.py                 |  5 -----
 testing/mozharness/scripts/desktop_unittest.py      | 12 +-----------
 6 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 22e49597a048..e3056907e353 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -46,7 +46,6 @@ config = {
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
-        "mozbase": "test.py",
         "mozmill": "runtestlist.py",
     },
     "minimum_tests_zip_dirs": [
@@ -103,14 +102,6 @@ config = {
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
-        "mozbase": {
-            "options": [
-                "-b",
-                "%(binary_path)s"
-            ],
-            "run_filename": "test.py",
-            "testsdir": "mozbase"
-        },
         "mozmill": {
             "options": [
                 "--binary=%(binary_path)s",
@@ -245,9 +236,6 @@ config = {
         "jittest2": ["--total-chunks=2", "--this-chunk=2"],
         "jittest-chunked": [],
     },
-    "all_mozbase_suites": {
-        "mozbase": []
-    },
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         # NOTE 'enabled' is only here while we have unconsolidated configs
@@ -278,7 +266,6 @@ config = {
                              "mozmill": [],
                              "cppunittest": [],
                              "jittest": [],
-                             "mozbase": [],
                              },
     "download_minidump_stackwalk": True,
     "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py
index b64fb4cabecb..9dac8366dd7e 100644
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -20,7 +20,6 @@ config = {
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
-        "mozbase": "test.py",
         "mozmill": "runtestlist.py",
     },
     "minimum_tests_zip_dirs": [
@@ -73,14 +72,6 @@ config = {
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
-        "mozbase": {
-            "options": [
-                "-b",
-                "%(binary_path)s"
-            ],
-            "run_filename": "test.py",
-            "testsdir": "mozbase"
-        },
         "mozmill": {
             "options": [
                 "--binary=%(binary_path)s",
@@ -194,9 +185,6 @@ config = {
         "jittest": [],
         "jittest-chunked": []
     },
-    "all_mozbase_suites": {
-        "mozbase": []
-    },
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         # NOTE 'enabled' is only here while we have unconsolidated configs
@@ -227,7 +215,6 @@ config = {
                              "mozmill": [],
                              "cppunittest": [],
                              "jittest": [],
-                             "mozbase": [],
                              },
     "download_minidump_stackwalk": True,
     "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
diff --git a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
index fd36ca185690..9db10c32feae 100644
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -41,7 +41,6 @@ config = {
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
-        "mozbase": "test.py",
         "mozmill": "runtestlist.py",
     },
     "minimum_tests_zip_dirs": [
@@ -95,14 +94,6 @@ config = {
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
-        "mozbase": {
-            "options": [
-                "-b",
-                "%(binary_path)s"
-            ],
-            "run_filename": "test.py",
-            "testsdir": "mozbase"
-        },
         "mozmill": {
             "options": [
                 "--binary=%(binary_path)s",
@@ -228,9 +219,6 @@ config = {
         "jittest": [],
         "jittest-chunked": [],
     },
-    "all_mozbase_suites": {
-        "mozbase": []
-    },
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         {
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index b5a9346d817c..6abefe5f5bba 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -30,7 +30,6 @@ config = {
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
-        "mozbase": "test.py",
         "mozmill": "runtestlist.py",
     },
     "minimum_tests_zip_dirs": [
@@ -84,14 +83,6 @@ config = {
             "run_filename": "runtests.py",
             "testsdir": "mochitest"
         },
-        "mozbase": {
-            "options": [
-                "-b",
-                "%(binary_path)s"
-            ],
-            "run_filename": "test.py",
-            "testsdir": "mozbase"
-        },
         "mozmill": {
             "options": [
                 "--binary=%(binary_path)s",
@@ -220,9 +211,6 @@ config = {
     "all_jittest_suites": {
         "jittest": []
     },
-    "all_mozbase_suites": {
-        "mozbase": []
-    },
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         # NOTE 'enabled' is only here while we have unconsolidated configs
@@ -254,7 +242,6 @@ config = {
                              "mozmill": [],
                              "cppunittest": [],
                              "jittest": [],
-                             "mozbase": [],
                              },
     "download_minidump_stackwalk": True,
     "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
diff --git a/testing/mozharness/mach_commands.py b/testing/mozharness/mach_commands.py
index 952db7ca044c..649844629522 100644
--- a/testing/mozharness/mach_commands.py
+++ b/testing/mozharness/mach_commands.py
@@ -117,11 +117,6 @@ class MozharnessRunner(MozbuildObject):
                 "config": desktop_unittest_config + [
                     "--jittest-suite", "jittest"]
             },
-            "mozbase": {
-                "script": "desktop_unittest.py",
-                "config": desktop_unittest_config + [
-                    "--mozbase-suite", "mozbase"]
-            },
             "marionette": {
                 "script": "marionette.py",
                 "config": ["--config-file", self.config_path("marionette",
diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py
index c699c1731655..c52ddf9de30f 100755
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -39,7 +39,7 @@ from mozharness.mozilla.testing.codecoverage import (
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 
 SUITE_CATEGORIES = ['gtest', 'cppunittest', 'jittest', 'mochitest', 'reftest', 'xpcshell',
-                    'mozbase', 'mozmill']
+                    'mozmill']
 SUITE_DEFAULT_E10S = ['mochitest', 'reftest']
 SUITE_NO_E10S = ['xpcshell']
 
@@ -96,14 +96,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
                     "Suites are defined in the config file\n."
                     "Examples: 'jittest'"}
          ],
-        [['--mozbase-suite', ], {
-            "action": "extend",
-            "dest": "specified_mozbase_suites",
-            "type": "string",
-            "help": "Specify which mozbase suite to run. "
-                    "Suites are defined in the config file\n."
-                    "Examples: 'mozbase'"}
-         ],
         [['--mozmill-suite', ], {
             "action": "extend",
             "dest": "specified_mozmill_suites",
@@ -217,7 +209,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
             ('specified_cppunittest_suites', 'cppunit'),
             ('specified_gtest_suites', 'gtest'),
             ('specified_jittest_suites', 'jittest'),
-            ('specified_mozbase_suites', 'mozbase'),
             ('specified_mozmill_suites', 'mozmill'),
         )
         for s, prefix in suites:
@@ -274,7 +265,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
                                                    'blobber_upload_dir')
         dirs['abs_jittest_dir'] = os.path.join(dirs['abs_test_install_dir'],
                                                "jit-test", "jit-test")
-        dirs['abs_mozbase_dir'] = os.path.join(dirs['abs_test_install_dir'], "mozbase")
         dirs['abs_mozmill_dir'] = os.path.join(dirs['abs_test_install_dir'], "mozmill")
 
         if os.path.isabs(c['virtualenv_path']):

From d50993e6a463f79e83b269955698e63c886557ea Mon Sep 17 00:00:00 2001
From: Ryan Hunt <rhunt@eqrion.net>
Date: Thu, 19 Jul 2018 12:41:34 -0500
Subject: [PATCH 19/29] Bug 1477799 - Use the paint thread instead of workers
 when we only have one worker. r=jrmuizel

MozReview-Commit-ID: 3mR4KrS924N

--HG--
extra : rebase_source : 3075243361b7f1772854c85336e7d75a207b8cb6
extra : source : ccf97cb6779fafeb54f30b251487ae24c630e08b
---
 gfx/layers/PaintThread.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gfx/layers/PaintThread.cpp b/gfx/layers/PaintThread.cpp
index ef268f47651b..c5758e97e30b 100644
--- a/gfx/layers/PaintThread.cpp
+++ b/gfx/layers/PaintThread.cpp
@@ -224,7 +224,9 @@ PaintThread::InitPaintWorkers()
 {
   MOZ_ASSERT(NS_IsMainThread());
   int32_t count = PaintThread::CalculatePaintWorkerCount();
-  mPaintWorkers = SharedThreadPool::Get(NS_LITERAL_CSTRING("PaintWorker"), count);
+  if (count != 1) {
+    mPaintWorkers = SharedThreadPool::Get(NS_LITERAL_CSTRING("PaintWorker"), count);
+  }
 }
 
 void
@@ -273,7 +275,8 @@ PaintThread::IsOnPaintThread()
 bool
 PaintThread::IsOnPaintWorkerThread()
 {
-  return mPaintWorkers && mPaintWorkers->IsOnCurrentThread();
+  return (mPaintWorkers && mPaintWorkers->IsOnCurrentThread()) ||
+    (sThreadId == PlatformThread::CurrentId());
 }
 
 void
@@ -419,7 +422,6 @@ PaintThread::PaintTiledContents(CapturedTiledPaintState* aState)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aState);
-  MOZ_ASSERT(mPaintWorkers);
 
   if (gfxPrefs::LayersOMTPDumpCapture() && aState->mCapture) {
     aState->mCapture->Dump();
@@ -437,10 +439,14 @@ PaintThread::PaintTiledContents(CapturedTiledPaintState* aState)
     self->AsyncPaintTiledContents(cbc, state);
   });
 
+  nsIEventTarget* paintThread = mPaintWorkers ?
+    static_cast<nsIEventTarget*>(mPaintWorkers.get()) :
+    static_cast<nsIEventTarget*>(sThread.get());
+
 #ifndef OMTP_FORCE_SYNC
-  mPaintWorkers->Dispatch(task.forget());
+  paintThread->Dispatch(task.forget());
 #else
-  SyncRunnable::DispatchToThread(mPaintWorkers, task);
+  SyncRunnable::DispatchToThread(paintThread, task);
 #endif
 }
 

From 33f8e97d979d3c44f96c0bc274164d9a437785dd Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Fri, 27 Jul 2018 19:31:43 +0300
Subject: [PATCH 20/29] Backed out 3 changesets (bug 1470922) for devtools
 failures at
 devtools/client/debugger/test/mochitest/browser_dbg_split-console-keypress.js

Backed out changeset 57b9025b5573 (bug 1470922)
Backed out changeset c30835ae0523 (bug 1470922)
Backed out changeset bb2a99260093 (bug 1470922)

--HG--
extra : rebase_source : 301d242564ee91b43069b60a7dc99f7c66955fde
---
 .../framework/test/browser_toolbox_split_console.js    | 10 ++++------
 .../test/browser_inspector_menu-04-use-in-console.js   |  5 +++--
 devtools/client/preferences/devtools-client.js         |  6 +-----
 devtools/client/webconsole/test/mocha-test-setup.js    |  2 +-
 .../browser_jsterm_add_edited_input_to_history.js      |  1 -
 ...ocomplete-properties-with-non-alphanumeric-names.js |  1 -
 .../browser_jsterm_autocomplete_array_no_index.js      |  1 -
 .../browser_jsterm_autocomplete_arrow_keys.js          |  1 -
 .../browser_jsterm_autocomplete_cached_results.js      |  1 -
 .../mochitest/browser_jsterm_autocomplete_commands.js  |  1 -
 .../browser_jsterm_autocomplete_crossdomain_iframe.js  |  1 -
 .../browser_jsterm_autocomplete_escape_key.js          |  1 -
 ..._jsterm_autocomplete_extraneous_closing_brackets.js |  1 -
 .../mochitest/browser_jsterm_autocomplete_helpers.js   |  1 -
 .../browser_jsterm_autocomplete_in_chrome_tab.js       |  1 -
 ...owser_jsterm_autocomplete_in_debugger_stackframe.js |  1 -
 .../browser_jsterm_autocomplete_inside_text.js         |  1 -
 .../browser_jsterm_autocomplete_native_getters.js      |  1 -
 .../browser_jsterm_autocomplete_nav_and_tab_key.js     |  1 -
 .../browser_jsterm_autocomplete_paste_undo.js          |  1 -
 .../browser_jsterm_autocomplete_return_key.js          |  1 -
 ...wser_jsterm_autocomplete_return_key_no_selection.js |  1 -
 .../test/mochitest/browser_jsterm_completion.js        |  1 -
 .../browser_jsterm_content_defined_helpers.js          |  1 -
 .../test/mochitest/browser_jsterm_copy_command.js      |  1 -
 .../test/mochitest/browser_jsterm_ctrl_a_select_all.js |  1 -
 .../test/mochitest/browser_jsterm_ctrl_key_nav.js      |  1 -
 .../test/mochitest/browser_jsterm_document_no_xray.js  |  1 -
 .../test/mochitest/browser_jsterm_error_docs.js        |  1 -
 .../browser_jsterm_error_outside_valid_range.js        |  1 -
 .../test/mochitest/browser_jsterm_helper_clear.js      |  1 -
 .../test/mochitest/browser_jsterm_helper_dollar.js     |  1 -
 .../mochitest/browser_jsterm_helper_dollar_dollar.js   |  1 -
 .../test/mochitest/browser_jsterm_helper_dollar_x.js   |  1 -
 .../test/mochitest/browser_jsterm_helper_help.js       |  1 -
 .../mochitest/browser_jsterm_helper_keys_values.js     |  1 -
 .../test/mochitest/browser_jsterm_helper_pprint.js     |  1 -
 ...r_jsterm_hide_when_devtools_chrome_enabled_false.js |  1 -
 .../test/mochitest/browser_jsterm_history.js           |  1 -
 .../mochitest/browser_jsterm_history_arrow_keys.js     |  1 -
 .../test/mochitest/browser_jsterm_history_nav.js       |  1 -
 .../test/mochitest/browser_jsterm_history_persist.js   |  1 -
 .../test/mochitest/browser_jsterm_input_expansion.js   |  1 -
 .../test/mochitest/browser_jsterm_inspect.js           |  1 -
 .../test/mochitest/browser_jsterm_instance_of.js       |  1 -
 .../test/mochitest/browser_jsterm_multiline.js         |  1 -
 ...er_jsterm_no_autocompletion_on_defined_variables.js |  1 -
 .../browser_jsterm_no_input_and_tab_key_pressed.js     |  1 -
 .../test/mochitest/browser_jsterm_null_undefined.js    |  1 -
 .../browser_jsterm_popup_close_on_tab_switch.js        |  1 -
 .../browser_jsterm_screenshot_command_clipboard.js     |  1 -
 .../browser_jsterm_screenshot_command_file.js          |  1 -
 .../test/mochitest/browser_jsterm_selfxss.js           |  1 -
 .../client/webconsole/webconsole-output-wrapper.js     |  4 +---
 54 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/devtools/client/framework/test/browser_toolbox_split_console.js b/devtools/client/framework/test/browser_toolbox_split_console.js
index fa40ba1268d0..63c469fd747e 100644
--- a/devtools/client/framework/test/browser_toolbox_split_console.js
+++ b/devtools/client/framework/test/browser_toolbox_split_console.js
@@ -52,7 +52,8 @@ function testUseKeyWithSplitConsole() {
   }, "jsdebugger");
 
   info("synthesizeKey with the console focused");
-  focusConsoleInput();
+  const consoleInput = gToolbox.getPanel("webconsole").hud.jsterm.inputNode;
+  consoleInput.focus();
   synthesizeKeyShortcut("F3", panelWin);
 
   ok(commandCalled, "Shortcut key should trigger the command");
@@ -68,7 +69,8 @@ function testUseKeyWithSplitConsoleWrongTool() {
   }, "inspector");
 
   info("synthesizeKey with the console focused");
-  focusConsoleInput();
+  const consoleInput = gToolbox.getPanel("webconsole").hud.jsterm.inputNode;
+  consoleInput.focus();
   synthesizeKeyShortcut("F4", panelWin);
 
   ok(!commandCalled, "Shortcut key shouldn't trigger the command");
@@ -79,7 +81,3 @@ async function cleanup() {
   gBrowser.removeCurrentTab();
   gToolbox = panelWin = null;
 }
-
-function focusConsoleInput() {
-  gToolbox.getPanel("webconsole").hud.jsterm.focus();
-}
diff --git a/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js b/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
index 19a41db4acd0..46a36a6b6d00 100644
--- a/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
+++ b/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
@@ -28,7 +28,8 @@ add_task(async function() {
     const hud = toolbox.getPanel("webconsole").hud;
     const jsterm = hud.jsterm;
 
-    is(jsterm.getInputValue(), "temp0", "first console variable is named temp0");
+    const jstermInput = jsterm.hud.document.querySelector(".jsterm-input-node");
+    is(jstermInput.value, "temp0", "first console variable is named temp0");
 
     let result = await jsterm.execute();
     isnot(result.textContent.indexOf('<p id="console-var">'), -1,
@@ -38,7 +39,7 @@ add_task(async function() {
     menuItem.click();
     await inspector.once("console-var-ready");
 
-    is(jsterm.getInputValue(), "temp1", "second console variable is named temp1");
+    is(jstermInput.value, "temp1", "second console variable is named temp1");
 
     result = await jsterm.execute();
     isnot(result.textContent.indexOf('<p id="console-var-multi">'), -1,
diff --git a/devtools/client/preferences/devtools-client.js b/devtools/client/preferences/devtools-client.js
index e267993eaeeb..1a9d38996c75 100644
--- a/devtools/client/preferences/devtools-client.js
+++ b/devtools/client/preferences/devtools-client.js
@@ -279,12 +279,8 @@ pref("devtools.webconsole.sidebarToggle", true);
 pref("devtools.webconsole.sidebarToggle", false);
 #endif
 
-// Enable CodeMirror in the JsTerm in Nightly builds
-#if defined(NIGHTLY_BUILD)
-pref("devtools.webconsole.jsterm.codeMirror", true);
-#else
+// Enable CodeMirror in the JsTerm: |false|
 pref("devtools.webconsole.jsterm.codeMirror", false);
-#endif
 
 // Disable the new performance recording panel by default
 pref("devtools.performance.new-panel-enabled", false);
diff --git a/devtools/client/webconsole/test/mocha-test-setup.js b/devtools/client/webconsole/test/mocha-test-setup.js
index a90fcaf15928..890f51d2c8a0 100644
--- a/devtools/client/webconsole/test/mocha-test-setup.js
+++ b/devtools/client/webconsole/test/mocha-test-setup.js
@@ -24,7 +24,7 @@ pref("devtools.webconsole.inputHistoryCount", 50);
 pref("devtools.webconsole.persistlog", false);
 pref("devtools.webconsole.timestampMessages", false);
 pref("devtools.webconsole.sidebarToggle", true);
-pref("devtools.webconsole.jsterm.codeMirror", true);
+pref("devtools.webconsole.jsterm.codeMirror", false);
 
 global.loader = {
   lazyServiceGetter: () => {},
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
index 97185424411a..f49a3cdcfef0 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
@@ -13,7 +13,6 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 817834";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
index 7051a1504a35..e501514e0257 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html;charset=utf8,test autocompletion with $ or _";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
index d99d367a26f4..a2068612dcf5 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
@@ -17,7 +17,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
index 76a3ea93e5c4..8245a2e525c4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js
@@ -17,7 +17,6 @@ const TEST_URI = `data:text/html;charset=utf-8,<head><script>
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
index b9462d2e08fc..3472bdab5c47 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
@@ -12,7 +12,6 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test cached autocompletion resu
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
index 1b668cc59d52..1631de274d5c 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js
@@ -9,7 +9,6 @@ const TEST_URI = `data:text/html;charset=utf-8,Test command autocomplete`;
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
index df34c3693624..452483ea1521 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -11,7 +11,6 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
index 7de7e2ce4897..3cf96df5f1ef 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
@@ -24,7 +24,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
index 8559c264d142..324a43d204e8 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
@@ -12,7 +12,6 @@ const TEST_URI = "data:text/html;charset=utf-8,test for bug 592442";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
index dffdcc6c12eb..b6b0881c0a34 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
@@ -12,7 +12,6 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test JSTerm Helpers autocomplet
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
index bba0630b999c..8a05f3d80c07 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
@@ -9,7 +9,6 @@
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
index 1c253b285e83..dfdd72dd0fa5 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
@@ -13,7 +13,6 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
index e433ce17d9bb..1fdaf2947a5e 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
@@ -18,7 +18,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
index 48dd2d42d1dd..9a48dd13ac7e 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
@@ -12,7 +12,6 @@ const TEST_URI = "data:text/html;charset=utf-8,Test document.body autocompletion
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
index b621b98d882e..6aecf7373afa 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
@@ -26,7 +26,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
index 461a70376ad3..db0942eb4339 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js
@@ -17,7 +17,6 @@ const stringToCopy = "foobazbarBug642615";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
index ed8026c62c65..68acfb055966 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
@@ -26,7 +26,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
index 037bddd29d17..f7542f96abdf 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
@@ -22,7 +22,6 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
index 85a2fe70bbea..d792b0c39700 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test code completion";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
index 587b06bdbeec..b83fab06bb18 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js
@@ -38,7 +38,6 @@ const TEST_URI = `data:text/html,<meta charset=utf8>
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
index 54bbb3bfe017..6631d7b7442f 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
@@ -28,7 +28,6 @@ const TEST_URI = `data:text/html;charset=utf-8,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
index ba167bdb1956..7f4b44dda65d 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html;charset=utf-8,Test console select all";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
index badef246af74..08695a280c3a 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
@@ -16,7 +16,6 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
index 43839176d3fe..53bab50ceb8b 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
@@ -7,7 +7,6 @@ const TEST_URI = "data:text/html,Test evaluating document";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
index 71b6ddd1cb4a..b6688338ef83 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
@@ -7,7 +7,6 @@ const TEST_URI = "data:text/html,Test error documentation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
index 22988360ec27..514ba7cc5967 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
@@ -10,7 +10,6 @@ const TEST_URI = "data:text/html,Test error documentation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
index 14dd716261b4..b41c77a960fe 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
@@ -7,7 +7,6 @@ const TEST_URI = "data:text/html,Test <code>clear()</code> jsterm helper";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
index dba6f86b062a..a03775a56be4 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
@@ -17,7 +17,6 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
index 1c05d5ec17e9..60be802e15cc 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
@@ -17,7 +17,6 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
index 229025f6f66d..1b0a603b62ef 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
@@ -17,7 +17,6 @@ const TEST_URI = `data:text/html,
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
index 87ee4e3cfb33..f36bee2d9166 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
@@ -8,7 +8,6 @@ const HELP_URL = "https://developer.mozilla.org/docs/Tools/Web_Console/Helpers";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
index 3ea9dbe16697..09345ef7a764 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
@@ -8,7 +8,6 @@ const TEST_URI =
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
index 39846e2553c4..ce53921b9ae3 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
@@ -7,7 +7,6 @@ const TEST_URI = "data:text/html,Test <code>pprint()</code> jsterm helper";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
index 31b20930163f..ac68ba67c658 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
@@ -24,7 +24,6 @@
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
index ba332203ec46..c2b3404d8df2 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
@@ -17,7 +17,6 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
index 4e093c6c54e3..9fbcae9cf69c 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js
@@ -20,7 +20,6 @@ const TEST_VALUES = [
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
index 218ccd3706fa..b6f61600d334 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
@@ -13,7 +13,6 @@ const TEST_URI = "data:text/html;charset=utf-8,<p>bug 660806 - history " +
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
index 4deeba7ac690..6f6f91fa093d 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
@@ -19,7 +19,6 @@ const {
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await testHistory();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
index 8767f8c8e17c..e71689533c33 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html;charset=utf-8,Test for jsterm multine input";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
index 68a4a0f5936f..d188fd5d9cd3 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test inspect() command";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
index b7b799b8f4ef..73a1db561054 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
@@ -8,7 +8,6 @@ const TEST_URI = "data:text/html,Test <code>instanceof</code> evaluation";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
index 92eaf760e646..81c6d46d476d 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
@@ -77,7 +77,6 @@ const DATA = [
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
index 2a8093829fd2..269c90b62470 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
@@ -12,7 +12,6 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
index d2f561d0d250..994ac1dc3481 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
@@ -11,7 +11,6 @@ const TEST_URI = "data:text/html,Testing jsterm with no input";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
index 580fbc5e5788..24767bcfa684 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
@@ -8,7 +8,6 @@ const TEST_URI =
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
index e7f0c279ed97..6906bca35d65 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
@@ -13,7 +13,6 @@ const TEST_URI_NAVIGATE = "data:text/html;charset=utf-8,<p>testing autocomplete
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
index 6bbc2513593d..e96e49d1b967 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
@@ -14,7 +14,6 @@ const dpr = "--dpr 1";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
index b2f6295150e6..5074ba5be8fe 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
@@ -15,7 +15,6 @@ const dpr = "--dpr 1";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTests();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
index fa0a7b4f66b5..4b3121e38157 100644
--- a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
@@ -18,7 +18,6 @@ const stringToCopy = "EvilCommand";
 
 add_task(async function() {
   // Run test with legacy JsTerm
-  await pushPref("devtools.webconsole.jsterm.codeMirror", false);
   await performTest();
   // And then run it with the CodeMirror-powered one.
   await pushPref("devtools.webconsole.jsterm.codeMirror", true);
diff --git a/devtools/client/webconsole/webconsole-output-wrapper.js b/devtools/client/webconsole/webconsole-output-wrapper.js
index 1d4267135d08..9323ebd3f83a 100644
--- a/devtools/client/webconsole/webconsole-output-wrapper.js
+++ b/devtools/client/webconsole/webconsole-output-wrapper.js
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const Services = require("Services");
 const { createElement, createFactory } = require("devtools/client/shared/vendor/react");
 const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { Provider } = require("devtools/client/shared/vendor/react-redux");
@@ -246,8 +245,7 @@ WebConsoleOutputWrapper.prototype = {
         hud,
         onFirstMeaningfulPaint: resolve,
         closeSplitConsole: this.closeSplitConsole.bind(this),
-        jstermCodeMirror: store.getState().prefs.jstermCodeMirror
-          && !Services.appinfo.accessibilityEnabled,
+        jstermCodeMirror: store.getState().prefs.jstermCodeMirror,
       });
 
       // Render the root Application component.

From 7d34b79e905be2d791a165ccb8dcd96940713fa8 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Fri, 27 Jul 2018 16:05:26 +0000
Subject: [PATCH 21/29] Bug 1478097 - Update indexer to visit implicit code
 inside constructors. r=emilio

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

--HG--
extra : moz-landing-system : lando
---
 .../mozsearch-plugin/MozsearchIndexer.cpp             | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp b/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
index d638629bf337..b0b92c291f71 100644
--- a/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
+++ b/build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp
@@ -158,8 +158,9 @@ private:
   // Tracks the set of declarations that the current expression/statement is
   // nested inside of.
   struct AutoSetContext {
-    AutoSetContext(IndexConsumer *Self, NamedDecl *Context)
+    AutoSetContext(IndexConsumer *Self, NamedDecl *Context, bool VisitImplicit = false)
         : Self(Self), Prev(Self->CurDeclContext), Decl(Context) {
+      this->VisitImplicit = VisitImplicit || (Prev ? Prev->VisitImplicit : false);
       Self->CurDeclContext = this;
     }
 
@@ -168,6 +169,7 @@ private:
     IndexConsumer *Self;
     AutoSetContext *Prev;
     NamedDecl *Decl;
+    bool VisitImplicit;
   };
   AutoSetContext *CurDeclContext;
 
@@ -571,7 +573,7 @@ public:
     return Super::TraverseCXXMethodDecl(D);
   }
   bool TraverseCXXConstructorDecl(CXXConstructorDecl *D) {
-    AutoSetContext Asc(this, D);
+    AutoSetContext Asc(this, D, true);
     const FunctionDecl *Def;
     // See TraverseFunctionDecl.
     if (TemplateStack && D->isDefined(Def) && Def && D != Def) {
@@ -796,6 +798,11 @@ public:
     return false;
   }
 
+  bool shouldVisitImplicitCode() const {
+    AutoSetContext *Ctxt = CurDeclContext;
+    return Ctxt ? Ctxt->VisitImplicit : false;
+  }
+
   bool TraverseClassTemplateDecl(ClassTemplateDecl *D) {
     AutoTemplateContext Atc(this);
     Super::TraverseClassTemplateDecl(D);

From 27148b0bc9e2a47cec9eec33446f6b040c9a3f22 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Fri, 27 Jul 2018 19:45:56 +0300
Subject: [PATCH 22/29] Backed out changeset 9fee865dcbf5 (bug 1468550) for
 xpcshell failures at
 toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js
 on a CLOSED TREE

---
 modules/libpref/init/all.js                   |  3 --
 .../components/extensions/ExtensionParent.jsm | 32 +-------------
 .../xpcshell/test_ext_performance_counters.js | 43 -------------------
 .../test/xpcshell/xpcshell-common.ini         |  1 -
 4 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 61320d41d707..aa4f16f567b5 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4969,9 +4969,6 @@ pref("extensions.webextensions.background-delayed-startup", false);
 // Whether or not the installed extensions should be migrated to the storage.local IndexedDB backend.
 pref("extensions.webextensions.ExtensionStorageIDB.enabled", false);
 
-// if enabled, store execution times for API calls
-pref("extensions.webextensions.enablePerformanceCounters", false);
-
 // Report Site Issue button
 pref("extensions.webcompat-reporter.newIssueEndpoint", "https://webcompat.com/issues/new");
 #if defined(MOZ_DEV_EDITION) || defined(NIGHTLY_BUILD)
diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index 4be1c0b0b388..e54630b82a8d 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -60,7 +60,6 @@ const BASE_SCHEMA = "chrome://extensions/content/schemas/manifest.json";
 const CATEGORY_EXTENSION_MODULES = "webextension-modules";
 const CATEGORY_EXTENSION_SCHEMAS = "webextension-schemas";
 const CATEGORY_EXTENSION_SCRIPTS = "webextension-scripts";
-const TIMING_ENABLED_PREF = "extensions.webextensions.enablePerformanceCounters";
 
 let schemaURLs = new Set();
 
@@ -750,9 +749,6 @@ class DevToolsExtensionPageContextParent extends ExtensionPageContextParent {
 }
 
 ParentAPIManager = {
-  // stores dispatches counts per web extension and API
-  performanceCounters: new DefaultMap(() => new DefaultMap(() => ({duration: 0, calls: 0}))),
-
   proxyContexts: new Map(),
 
   init() {
@@ -763,7 +759,6 @@ ParentAPIManager = {
     Services.mm.addMessageListener("API:Call", this);
     Services.mm.addMessageListener("API:AddListener", this);
     Services.mm.addMessageListener("API:RemoveListener", this);
-    XPCOMUtils.defineLazyPreferenceGetter(this, "_timingEnabled", TIMING_ENABLED_PREF, false);
   },
 
   attachMessageManager(extension, processMessageManager) {
@@ -881,26 +876,6 @@ ParentAPIManager = {
     }
   },
 
-  storeExecutionTime(webExtensionId, apiPath, duration) {
-    let apiCounter = this.performanceCounters.get(webExtensionId).get(apiPath);
-    apiCounter.duration += duration;
-    apiCounter.calls += 1;
-  },
-
-  async withTiming(data, callable) {
-    if (!this._timingEnabled) {
-      return callable();
-    }
-    let webExtId = data.childId.split(".")[0];
-    let start = Cu.now();
-    try {
-      return callable();
-    } finally {
-      let end = Cu.now();
-      this.storeExecutionTime(webExtId, data.path, end - start);
-    }
-  },
-
   async call(data, target) {
     let context = this.getContextById(data.childId);
     if (context.parentMessageManager !== target.messageManager) {
@@ -926,11 +901,8 @@ ParentAPIManager = {
       let args = data.args;
       let pendingBrowser = context.pendingEventBrowser;
       let fun = await context.apiCan.asyncFindAPIPath(data.path);
-      let result = this.withTiming(data, () => {
-        return context.withPendingBrowser(pendingBrowser,
-                                          () => fun(...args));
-      });
-
+      let result = context.withPendingBrowser(pendingBrowser,
+                                              () => fun(...args));
       if (data.callId) {
         result = result || Promise.resolve();
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js b/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js
deleted file mode 100644
index b8520d5dd8fc..000000000000
--- a/toolkit/components/extensions/test/xpcshell/test_ext_performance_counters.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
-const ENABLE_COUNTER_PREF = "extensions.webextensions.enablePerformanceCounters";
-
-let {
-  ParentAPIManager,
-} = ExtensionParent;
-
-
-async function test_counter() {
-  async function background() {
-    // creating a bookmark
-    let folder = await browser.bookmarks.create({title: "Folder"});
-    await browser.bookmarks.create({title: "Bookmark", url: "http://example.com",
-                                    parentId: folder.id});
-    browser.test.sendMessage("done");
-  }
-
-  let extensionData = {
-    background,
-    manifest: {
-      permissions: ["bookmarks"],
-    },
-  };
-
-  let extension = ExtensionTestUtils.loadExtension(extensionData);
-  await extension.startup();
-  await extension.awaitMessage("done");
-  await extension.unload();
-
-  // check that the bookmarks.create API was tracked
-  let counters = ParentAPIManager.performanceCounters;
-  let counter = counters.get(extension.id).get("bookmarks.create");
-  ok(counter.calls > 0);
-  ok(counter.duration > 0);
-}
-
-add_task(function test_performance_counter() {
-  return runWithPrefs([[ENABLE_COUNTER_PREF, true]], test_counter);
-});
diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
index a5a638b1c0ee..5122f11ecc4c 100644
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
@@ -134,4 +134,3 @@ skip-if = os == "android" # Bug 1350559
 [test_proxy_scripts.js]
 [test_proxy_scripts_results.js]
 [test_ext_brokenlinks.js]
-[test_ext_performance_counters.js]

From 25e4f07d6cd554c68518182602c31e12cedca900 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Fri, 27 Jul 2018 14:50:55 -0300
Subject: [PATCH 23/29] Bug 1470324 - Don't load enterprise policies in the
 content during startup. r=kmag

With this patch, EnterprisePoliciesContent.js will only be loaded whenever a check for isAllowed happens in content.

This patch also adds shortcuts to make sure that checks for about:blank, about:neterror and about:certerror are skipped

MozReview-Commit-ID: AdMrolJqouN

--HG--
extra : rebase_source : 0949427c78fe26743294c0c1b43844f0154003b7
---
 netwerk/protocol/about/nsAboutProtocolHandler.cpp |  7 ++++++-
 toolkit/xre/nsXREDirProvider.cpp                  | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
index c5a21d1f38a9..f15eddf1da56 100644
--- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
@@ -185,7 +185,12 @@ nsAboutProtocolHandler::NewChannel2(nsIURI* uri,
             // a srcdoc iframe.  To ensure that it stays unresolvable, we pretend
             // that it doesn't exist.
             rv = NS_ERROR_FACTORY_NOT_REGISTERED;
-        } else {
+        } else if (!path.EqualsLiteral("blank") &&
+                   !path.EqualsLiteral("neterror") &&
+                   !path.EqualsLiteral("home") &&
+                   !path.EqualsLiteral("welcome") &&
+                   !path.EqualsLiteral("newtab") &&
+                   !path.EqualsLiteral("certerror")) {
             nsCOMPtr<nsIEnterprisePolicies> policyManager =
                 do_GetService("@mozilla.org/browser/enterprisepolicies;1", &rv2);
             if (NS_SUCCEEDED(rv2)) {
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index fdc711b05759..939c7ac810bb 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -978,10 +978,13 @@ nsXREDirProvider::DoStartup()
     static const char16_t kStartup[] = {'s','t','a','r','t','u','p','\0'};
     obsSvc->NotifyObservers(nullptr, "profile-do-change", kStartup);
 
-    // Initialize the Enterprise Policies service
-    nsCOMPtr<nsIObserver> policies(do_GetService("@mozilla.org/browser/enterprisepolicies;1"));
-    if (policies) {
-      policies->Observe(nullptr, "policies-startup", nullptr);
+    // Initialize the Enterprise Policies service in the parent process
+    // In the content process it's loaded on demand when needed
+    if (XRE_IsParentProcess()) {
+      nsCOMPtr<nsIObserver> policies(do_GetService("@mozilla.org/browser/enterprisepolicies;1"));
+      if (policies) {
+        policies->Observe(nullptr, "policies-startup", nullptr);
+      }
     }
 
     // Init the Extension Manager

From ba935a61cb58fccb0e8bf32609ca57a603c2b8f7 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Fri, 27 Jul 2018 14:51:10 -0300
Subject: [PATCH 24/29] Bug 1470324 - Use sharedData instead of
 initialProcessData in the enterprise policies code. r=kmag

This significantly simplifies the content-side implementation of the enterprise policies code since it doesn't have to listen for updates on the disallowed features list (with that, it also doesn't need to load early in order to set up those listeners)

MozReview-Commit-ID: 3lyZXq1j3D5

--HG--
extra : rebase_source : 042e1c7efbeb02c7e7928419445aba15f972b746
---
 .../enterprisepolicies/EnterprisePolicies.js  | 25 +++++----------
 .../EnterprisePoliciesContent.js              | 31 +++----------------
 .../browser/browser_policies_basic_tests.js   |  6 ----
 3 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js
index 07df44426c5e..223f7e5b572d 100644
--- a/browser/components/enterprisepolicies/EnterprisePolicies.js
+++ b/browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -195,16 +195,16 @@ EnterprisePoliciesManager.prototype = {
 
     DisallowedFeatures = {};
 
+    Services.ppmm.sharedData.delete("EnterprisePolicies:Status");
+    Services.ppmm.sharedData.delete("EnterprisePolicies:DisallowedFeatures");
+
     this._status = Ci.nsIEnterprisePolicies.UNINITIALIZED;
     for (let timing of Object.keys(this._callbacks)) {
       this._callbacks[timing] = [];
     }
-    delete Services.ppmm.initialProcessData.policies;
-    Services.ppmm.broadcastAsyncMessage("EnterprisePolicies:Restart", null);
 
     let { PromiseUtils } = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm",
                                               {});
-
     // Simulate the startup process. This step-by-step is a bit ugly but it
     // tries to emulate the same behavior as of a normal startup.
 
@@ -259,21 +259,13 @@ EnterprisePoliciesManager.prototype = {
   },
 
   disallowFeature(feature, neededOnContentProcess = false) {
-    DisallowedFeatures[feature] = true;
+    DisallowedFeatures[feature] = neededOnContentProcess;
 
     // NOTE: For optimization purposes, only features marked as needed
     // on content process will be passed onto the child processes.
     if (neededOnContentProcess) {
-      Services.ppmm.initialProcessData.policies
-                                      .disallowedFeatures.push(feature);
-
-      if (Services.ppmm.childCount > 1) {
-        // If there has been a content process already initialized, let's
-        // broadcast the newly disallowed feature.
-        Services.ppmm.broadcastAsyncMessage(
-          "EnterprisePolicies:DisallowFeature", {feature}
-        );
-      }
+      Services.ppmm.sharedData.set("EnterprisePolicies:DisallowedFeatures",
+        new Set(Object.keys(DisallowedFeatures).filter(key => DisallowedFeatures[key])));
     }
   },
 
@@ -286,10 +278,7 @@ EnterprisePoliciesManager.prototype = {
   set status(val) {
     this._status = val;
     if (val != Ci.nsIEnterprisePolicies.INACTIVE) {
-      Services.ppmm.initialProcessData.policies = {
-        status: val,
-        disallowedFeatures: [],
-      };
+      Services.ppmm.sharedData.set("EnterprisePolicies:Status", val);
     }
     return val;
   },
diff --git a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
index 74e714af4854..8e79fe65d1d8 100644
--- a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
+++ b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
@@ -36,16 +36,6 @@ const EnterprisePoliciesFactory = {
 
 
 function EnterprisePoliciesManagerContent() {
-  let policies = Services.cpmm.initialProcessData.policies;
-  if (policies) {
-    this._status = policies.status;
-    // make a copy of the array so that we can keep adding to it
-    // in a way that is not confusing.
-    this._disallowedFeatures = policies.disallowedFeatures.slice();
-  }
-
-  Services.cpmm.addMessageListener("EnterprisePolicies:DisallowFeature", this);
-  Services.cpmm.addMessageListener("EnterprisePolicies:Restart", this);
 }
 
 EnterprisePoliciesManagerContent.prototype = {
@@ -56,28 +46,15 @@ EnterprisePoliciesManagerContent.prototype = {
   // redefine the default factory for XPCOMUtils
   _xpcom_factory: EnterprisePoliciesFactory,
 
-  _status: Ci.nsIEnterprisePolicies.INACTIVE,
-
-  _disallowedFeatures: [],
-
-  receiveMessage({name, data}) {
-    switch (name) {
-      case "EnterprisePolicies:DisallowFeature":
-        this._disallowedFeatures.push(data.feature);
-        break;
-
-      case "EnterprisePolicies:Restart":
-        this._disallowedFeatures = [];
-        break;
-    }
-  },
 
   get status() {
-    return this._status;
+    return Services.cpmm.sharedData.get("EnterprisePolicies:Status") ||
+           Ci.nsIEnterprisePolicies.INACTIVE;
   },
 
   isAllowed(feature) {
-    return !this._disallowedFeatures.includes(feature);
+    let disallowedFeatures = Services.cpmm.sharedData.get("EnterprisePolicies:DisallowedFeatures");
+    return !(disallowedFeatures && disallowedFeatures.has(feature));
   },
 
   getActivePolicies() {
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js b/browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
index 7a3c92268be3..a18562f49930 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policies_basic_tests.js
@@ -4,12 +4,6 @@
 "use strict";
 
 add_task(async function test_simple_policies() {
-  await ContentTask.spawn(gBrowser.selectedBrowser, null, async function() {
-    // Initialize the service in the content process, in case it hasn't
-    // already started.
-    Services.policies;
-  });
-
   let { Policies } = ChromeUtils.import("resource:///modules/policies/Policies.jsm", {});
 
   let policy0Ran = false, policy1Ran = false, policy2Ran = false, policy3Ran = false;

From bea03efd33dc186bd6ba5f1b639a654b64fb6d0b Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Fri, 27 Jul 2018 14:51:12 -0300
Subject: [PATCH 25/29] Bug 1470324 - Clean up some unused code in
 EnterprisePoliciesContent.js. r=kmag

There was some unused code in this file which was wasting memory.

This patch also avoids some more policies from being sent to the content process as they are not really needed there

MozReview-Commit-ID: C4FzesWMQi0

--HG--
extra : rebase_source : ba21f04cca8614d9dd4b34f4e093ece0e3153502
---
 .../performance/browser_startup_content.js    |  1 -
 .../enterprisepolicies/EnterprisePolicies.js  | 23 +---------
 .../EnterprisePoliciesContent.js              | 45 ++-----------------
 .../enterprisepolicies/Policies.jsm           |  8 ++--
 .../browser_policies_getActivePolicies.js     |  2 +-
 5 files changed, 10 insertions(+), 69 deletions(-)

diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
index 521808a26c11..12e3446996c8 100644
--- a/browser/base/content/test/performance/browser_startup_content.js
+++ b/browser/base/content/test/performance/browser_startup_content.js
@@ -20,7 +20,6 @@ const kDumpAllStacks = false;
 const whitelist = {
   components: new Set([
     "ContentProcessSingleton.js",
-    "EnterprisePoliciesContent.js", // bug 1470324
     "extension-process-script.js",
   ]),
   modules: new Set([
diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js
index 223f7e5b572d..7825d74514c2 100644
--- a/browser/components/enterprisepolicies/EnterprisePolicies.js
+++ b/browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -43,22 +43,6 @@ XPCOMUtils.defineLazyGetter(this, "log", () => {
   });
 });
 
-// ==== Start XPCOM Boilerplate ==== \\
-
-// Factory object
-const EnterprisePoliciesFactory = {
-  _instance: null,
-  createInstance: function BGSF_createInstance(outer, iid) {
-    if (outer != null)
-      throw Cr.NS_ERROR_NO_AGGREGATION;
-    return this._instance == null ?
-      this._instance = new EnterprisePoliciesManager() : this._instance;
-  }
-};
-
-// ==== End XPCOM Boilerplate ==== //
-
-// Constructor
 function EnterprisePoliciesManager() {
   Services.obs.addObserver(this, "profile-after-change", true);
   Services.obs.addObserver(this, "final-ui-startup", true);
@@ -67,14 +51,11 @@ function EnterprisePoliciesManager() {
 }
 
 EnterprisePoliciesManager.prototype = {
-  // for XPCOM
-  classID:          Components.ID("{ea4e1414-779b-458b-9d1f-d18e8efbc145}"),
+  classID:        Components.ID("{ea4e1414-779b-458b-9d1f-d18e8efbc145}"),
   QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
                                           Ci.nsISupportsWeakReference,
                                           Ci.nsIEnterprisePolicies]),
-
-  // redefine the default factory for XPCOMUtils
-  _xpcom_factory: EnterprisePoliciesFactory,
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(EnterprisePoliciesManager),
 
   _initialize() {
     let provider = this._chooseProvider();
diff --git a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
index 8e79fe65d1d8..eba364a69fb5 100644
--- a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
+++ b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
@@ -5,47 +5,13 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const PREF_LOGLEVEL           = "browser.policies.loglevel";
-
-XPCOMUtils.defineLazyGetter(this, "log", () => {
-  let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
-  return new ConsoleAPI({
-    prefix: "Enterprise Policies Child",
-    // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
-    // messages during development. See LOG_LEVELS in Console.jsm for details.
-    maxLogLevel: "error",
-    maxLogLevelPref: PREF_LOGLEVEL,
-  });
-});
-
-
-// ==== Start XPCOM Boilerplate ==== \\
-
-// Factory object
-const EnterprisePoliciesFactory = {
-  _instance: null,
-  createInstance: function BGSF_createInstance(outer, iid) {
-    if (outer != null)
-      throw Cr.NS_ERROR_NO_AGGREGATION;
-    return this._instance == null ?
-      this._instance = new EnterprisePoliciesManagerContent() : this._instance;
-  }
-};
-
-// ==== End XPCOM Boilerplate ==== //
-
-
 function EnterprisePoliciesManagerContent() {
 }
 
 EnterprisePoliciesManagerContent.prototype = {
-  // for XPCOM
-  classID:          Components.ID("{dc6358f8-d167-4566-bf5b-4350b5e6a7a2}"),
+  classID:        Components.ID("{dc6358f8-d167-4566-bf5b-4350b5e6a7a2}"),
   QueryInterface: ChromeUtils.generateQI([Ci.nsIEnterprisePolicies]),
-
-  // redefine the default factory for XPCOMUtils
-  _xpcom_factory: EnterprisePoliciesFactory,
-
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(EnterprisePoliciesManagerContent),
 
   get status() {
     return Services.cpmm.sharedData.get("EnterprisePolicies:Status") ||
@@ -56,11 +22,6 @@ EnterprisePoliciesManagerContent.prototype = {
     let disallowedFeatures = Services.cpmm.sharedData.get("EnterprisePolicies:DisallowedFeatures");
     return !(disallowedFeatures && disallowedFeatures.has(feature));
   },
-
-  getActivePolicies() {
-    throw Cr.NS_ERROR_NOT_AVAILABLE;
-  }
 };
 
-var components = [EnterprisePoliciesManagerContent];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([EnterprisePoliciesManagerContent]);
diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index 9de92f59b1d1..17f1115649f8 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -101,7 +101,7 @@ var Policies = {
   "BlockAboutConfig": {
     onBeforeUIStartup(manager, param) {
       if (param) {
-        blockAboutPage(manager, "about:config", true);
+        blockAboutPage(manager, "about:config");
         setAndLockPref("devtools.chrome.enabled", false);
       }
     }
@@ -110,7 +110,7 @@ var Policies = {
   "BlockAboutProfiles": {
     onBeforeUIStartup(manager, param) {
       if (param) {
-        blockAboutPage(manager, "about:profiles", true);
+        blockAboutPage(manager, "about:profiles");
       }
     }
   },
@@ -118,7 +118,7 @@ var Policies = {
   "BlockAboutSupport": {
     onBeforeUIStartup(manager, param) {
       if (param) {
-        blockAboutPage(manager, "about:support", true);
+        blockAboutPage(manager, "about:support");
       }
     }
   },
@@ -339,7 +339,7 @@ var Policies = {
   "DisableSetDesktopBackground": {
     onBeforeUIStartup(manager, param) {
       if (param) {
-        manager.disallowFeature("setDesktopBackground", true);
+        manager.disallowFeature("setDesktopBackground");
       }
     }
   },
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js b/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
index 64ed03004226..b7a1a911b298 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policies_getActivePolicies.js
@@ -34,7 +34,7 @@ add_task(async function test_content_process() {
     try {
       Services.policies.getActivePolicies();
     } catch (ex) {
-      is(ex.result, Cr.NS_ERROR_NOT_AVAILABLE, "Function getActivePolicies() doesn't have a valid definition in the content process");
+      is(ex.result, Cr.NS_ERROR_XPC_JSOBJECT_HAS_NO_FUNCTION_NAMED, "Function getActivePolicies() doesn't have a valid definition in the content process");
     }
   });
 });

From 3728216a20852ff2863fd89cac73b4f32f3c91c0 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 26 Jul 2018 14:36:57 -0700
Subject: [PATCH 26/29] Bug 1477753: Implement missing cycle collection hooks
 for SharedMap. r=mccr8

MozReview-Commit-ID: E0ncT3e1Wb2

--HG--
extra : rebase_source : b7697484e3cb8a3b5c77332ddca4019160e7fe80
---
 dom/base/nsFrameMessageManager.cpp | 2 ++
 dom/ipc/SharedMap.cpp              | 8 ++++++++
 dom/ipc/SharedMap.h                | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
index f02031f59a54..108793ebd761 100644
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -126,6 +126,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsFrameMessageManager)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFrameMessageManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListeners)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChildManagers)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSharedData)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsFrameMessageManager)
@@ -138,6 +139,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFrameMessageManager)
     tmp->mChildManagers[i - 1]->Disconnect(false);
   }
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mChildManagers)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSharedData)
   tmp->mInitialProcessData.setNull();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
diff --git a/dom/ipc/SharedMap.cpp b/dom/ipc/SharedMap.cpp
index 23e12185ebf5..e1456acb112d 100644
--- a/dom/ipc/SharedMap.cpp
+++ b/dom/ipc/SharedMap.cpp
@@ -514,6 +514,14 @@ SharedMapChangeEvent::Constructor(EventTarget* aEventTarget,
   return event.forget();
 }
 
+NS_IMPL_CYCLE_COLLECTION_INHERITED(WritableSharedMap, SharedMap, mReadOnly)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WritableSharedMap)
+NS_INTERFACE_MAP_END_INHERITING(SharedMap)
+
+NS_IMPL_ADDREF_INHERITED(WritableSharedMap, SharedMap)
+NS_IMPL_RELEASE_INHERITED(WritableSharedMap, SharedMap)
+
 } // ipc
 } // dom
 } // mozilla
diff --git a/dom/ipc/SharedMap.h b/dom/ipc/SharedMap.h
index 70971d737680..3f2bec76f086 100644
--- a/dom/ipc/SharedMap.h
+++ b/dom/ipc/SharedMap.h
@@ -322,6 +322,8 @@ protected:
 class WritableSharedMap final : public SharedMap
 {
 public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(WritableSharedMap, SharedMap)
 
   WritableSharedMap();
 

From b3a838d6e42e60e7072cb935d4e4234e6202d6a6 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Fri, 13 Jul 2018 16:21:34 +0100
Subject: [PATCH 27/29] Bug 1474163 - Make use of sharedData for content theme
 data. r=mconley

MozReview-Commit-ID: Etz8huX2YCt

--HG--
rename : browser/modules/LightweightThemeChildListener.jsm => browser/modules/LightweightThemeChildHelper.jsm
extra : rebase_source : 913275a0002531ddefce19308fc13b3cfbf5efec
---
 browser/base/content/contentTheme.js          |  7 +-
 browser/base/content/tab-content.js           | 40 +++------
 .../performance/browser_startup_content.js    |  1 -
 .../modules/LightweightThemeChildHelper.jsm   | 71 ++++++++++++++++
 .../modules/LightweightThemeChildListener.jsm | 82 -------------------
 browser/modules/moz.build                     |  4 +-
 .../browser/browser_ext_themes_ntp_colors.js  |  4 +
 ...browser_ext_themes_ntp_colors_perwindow.js |  2 +
 toolkit/modules/LightweightThemeConsumer.jsm  | 26 +-----
 9 files changed, 98 insertions(+), 139 deletions(-)
 create mode 100644 browser/modules/LightweightThemeChildHelper.jsm
 delete mode 100644 browser/modules/LightweightThemeChildListener.jsm

diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js
index d993ec749214..99e4016ec347 100644
--- a/browser/base/content/contentTheme.js
+++ b/browser/base/content/contentTheme.js
@@ -46,17 +46,14 @@ const ContentThemeController = {
    */
   init() {
     addEventListener("LightweightTheme:Set", this);
-
-    const event = new CustomEvent("LightweightTheme:Support", {bubbles: true});
-    document.dispatchEvent(event);
   },
 
   /**
    * Handle theme updates from the frame script.
    * @param {Object} event object containing the theme update.
    */
-  handleEvent({ detail }) {
-    if (detail.type == "LightweightTheme:Update") {
+  handleEvent({ type, detail }) {
+    if (type == "LightweightTheme:Set") {
       let {data} = detail;
       if (!data) {
         data = {};
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index a18547f54250..694bfdc3024a 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -24,8 +24,6 @@ ChromeUtils.defineModuleGetter(this, "ReaderMode",
   "resource://gre/modules/ReaderMode.jsm");
 ChromeUtils.defineModuleGetter(this, "PageStyleHandler",
   "resource:///modules/PageStyleHandler.jsm");
-ChromeUtils.defineModuleGetter(this, "LightweightThemeChildListener",
-  "resource:///modules/LightweightThemeChildListener.jsm");
 
 // TabChildGlobal
 var global = this;
@@ -89,33 +87,21 @@ addMessageListener("MixedContent:ReenableProtection", function() {
   docShell.mixedContentChannel = null;
 });
 
-var LightweightThemeChildListenerStub = {
-  _childListener: null,
-  get childListener() {
-    if (!this._childListener) {
-      this._childListener = new LightweightThemeChildListener();
-    }
-    return this._childListener;
-  },
+XPCOMUtils.defineLazyProxy(this, "LightweightThemeChildHelper",
+  "resource:///modules/LightweightThemeChildHelper.jsm");
 
-  init() {
-    addEventListener("LightweightTheme:Support", this, false, true);
-    addMessageListener("LightweightTheme:Update", this);
-    sendAsyncMessage("LightweightTheme:Request");
-    this.init = null;
-  },
-
-  handleEvent(event) {
-    return this.childListener.handleEvent(event);
-  },
-
-  receiveMessage(msg) {
-    return this.childListener.receiveMessage(msg);
-  },
-};
-
-LightweightThemeChildListenerStub.init();
+let themeablePagesWhitelist = new Set([
+  "about:home",
+  "about:newtab",
+  "about:welcome",
+]);
 
+addEventListener("pageshow", function({ originalTarget }) {
+  if (originalTarget.defaultView == content && themeablePagesWhitelist.has(content.document.documentURI)) {
+    LightweightThemeChildHelper.listen(themeablePagesWhitelist);
+    LightweightThemeChildHelper.update(chromeOuterWindowID, content);
+  }
+}, false, true);
 
 var AboutReaderListener = {
 
diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
index 12e3446996c8..a5b2bed65aaf 100644
--- a/browser/base/content/test/performance/browser_startup_content.js
+++ b/browser/base/content/test/performance/browser_startup_content.js
@@ -55,7 +55,6 @@ const whitelist = {
     "resource:///modules/ContentLinkHandler.jsm",
     "resource:///modules/ContentMetaHandler.jsm",
     "resource:///modules/PageStyleHandler.jsm",
-    "resource:///modules/LightweightThemeChildListener.jsm",
     "resource://gre/modules/BrowserUtils.jsm",
     "resource://gre/modules/E10SUtils.jsm",
     "resource://gre/modules/PrivateBrowsingUtils.jsm",
diff --git a/browser/modules/LightweightThemeChildHelper.jsm b/browser/modules/LightweightThemeChildHelper.jsm
new file mode 100644
index 000000000000..b910bcdc6b73
--- /dev/null
+++ b/browser/modules/LightweightThemeChildHelper.jsm
@@ -0,0 +1,71 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+var EXPORTED_SYMBOLS = ["LightweightThemeChildHelper"];
+
+/**
+ * LightweightThemeChildHelper forwards theme data to in-content pages.
+ */
+var LightweightThemeChildHelper = {
+  listener: null,
+  whitelist: [],
+
+  /**
+   * Listen to theme updates for the current process
+   * @param {Array} whitelist The pages that can receive theme updates.
+   */
+  listen(whitelist) {
+    if (!this.listener) {
+      // Clone the whitelist to avoid leaking the global the whitelist
+      // originates from.
+      this.whitelist = new Set([...whitelist]);
+      this.listener = ({ changedKeys }) => {
+        if (changedKeys.find(change => change.startsWith("theme/"))) {
+          this._updateProcess(changedKeys);
+        }
+      };
+      Services.cpmm.sharedData.addEventListener("change", this.listener);
+    }
+  },
+
+  /**
+   * Update the theme data for the whole process
+   * @param {Array} changedKeys The sharedData keys that were changed.
+   */
+  _updateProcess(changedKeys) {
+    const windowEnumerator = Services.ww.getWindowEnumerator();
+    while (windowEnumerator.hasMoreElements()) {
+      const window = windowEnumerator.getNext().QueryInterface(Ci.nsIDOMWindow);
+      const tabChildGlobal = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                                   .getInterface(Ci.nsIDocShell)
+                                   .sameTypeRootTreeItem
+                                   .QueryInterface(Ci.nsIInterfaceRequestor)
+                                   .getInterface(Ci.nsIContentFrameMessageManager);
+      const {chromeOuterWindowID, content} = tabChildGlobal;
+      if (changedKeys.includes(`theme/${chromeOuterWindowID}`) &&
+          content && this.whitelist.has(content.document.documentURI)) {
+        this.update(chromeOuterWindowID, content);
+      }
+    }
+  },
+
+  /**
+   * Forward the theme data to the page.
+   * @param {Object} outerWindowID The outerWindowID the parent process window has.
+   * @param {Object} content The receiving global
+   */
+  update(outerWindowID, content) {
+    const event = Cu.cloneInto({
+      detail: {
+        data: Services.cpmm.sharedData.get(`theme/${outerWindowID}`)
+      },
+    }, content);
+    content.dispatchEvent(new content.CustomEvent("LightweightTheme:Set",
+                                                  event));
+  },
+};
diff --git a/browser/modules/LightweightThemeChildListener.jsm b/browser/modules/LightweightThemeChildListener.jsm
deleted file mode 100644
index 48b74597d48d..000000000000
--- a/browser/modules/LightweightThemeChildListener.jsm
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/**
- * LightweightThemeChildListener forwards theme updates from LightweightThemeConsumer to
- * the whitelisted in-content pages
- */
-class LightweightThemeChildListener {
-  constructor() {
-    /**
-     * The pages that will receive theme updates
-     */
-    this.whitelist = new Set([
-      "about:home",
-      "about:newtab",
-      "about:welcome",
-    ]);
-
-    /**
-     * The last theme data received from LightweightThemeConsumer
-     */
-    this._lastData = null;
-  }
-
-  /**
-   * Handles theme updates from the parent process
-   * @param {Object} message from the parent process.
-   */
-  receiveMessage({ name, data, target }) {
-    if (name == "LightweightTheme:Update") {
-      this._lastData = data;
-      this._update(data, target.content);
-    }
-  }
-
-  /**
-   * Handles events from the content scope.
-   * @param {Object} event The received event.
-   */
-  handleEvent(event) {
-    const content = event.originalTarget.defaultView;
-    if (content != content.top) {
-      return;
-    }
-
-    if (event.type == "LightweightTheme:Support") {
-      this._update(this._lastData, content);
-    }
-  }
-
-  /**
-   * Checks if a given global is allowed to receive theme updates
-   * @param {Object} content The global to check against.
-   * @returns {boolean} Whether the global is allowed to receive updates.
-   */
-  _isContentWhitelisted(content) {
-    return this.whitelist.has(content.document.documentURI);
-  }
-
-  /**
-   * Forward the theme data to the page.
-   * @param {Object} data The theme data to forward
-   * @param {Object} content The receiving global
-   */
-  _update(data, content) {
-    if (this._isContentWhitelisted(content)) {
-      const event = Cu.cloneInto({
-        detail: {
-          type: "LightweightTheme:Update",
-          data,
-        },
-      }, content);
-      content.dispatchEvent(new content.CustomEvent("LightweightTheme:Set",
-                                                    event));
-    }
-  }
-}
-
-var EXPORTED_SYMBOLS = ["LightweightThemeChildListener"];
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index d4a33a75f3ff..64cc0be4b185 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -64,7 +64,7 @@ with Files("ExtensionsUI.jsm"):
 with Files("LaterRun.jsm"):
     BUG_COMPONENT = ("Firefox", "Tours")
 
-with Files("LightweightThemeChildListener.jsm"):
+with Files("LightweightThemeChildHelper.jsm"):
     BUG_COMPONENT = ("WebExtensions", "Themes")
 
 with Files("LightWeightThemeWebInstallListener.jsm"):
@@ -153,7 +153,7 @@ EXTRA_JS_MODULES += [
     'FormValidationHandler.jsm',
     'HomePage.jsm',
     'LaterRun.jsm',
-    'LightweightThemeChildListener.jsm',
+    'LightweightThemeChildHelper.jsm',
     'LightWeightThemeWebInstallListener.jsm',
     'NetErrorContent.jsm',
     'OpenInTabsUtils.jsm',
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
index 11935680c37c..387466a25837 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors.js
@@ -34,6 +34,8 @@ async function test_ntp_theme(theme, isBrightText) {
 
   await extension.startup();
 
+  Services.ppmm.sharedData.flush();
+
   await ContentTask.spawn(browser, {
     isBrightText,
     background: hexToCSS(theme.colors.ntp_background),
@@ -53,6 +55,8 @@ async function test_ntp_theme(theme, isBrightText) {
 
   await extension.unload();
 
+  Services.ppmm.sharedData.flush();
+
   await ContentTask.spawn(browser, {
     originalBackground,
     originalColor,
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
index 3bb2274b0ae1..7fcbff30a244 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_ntp_colors_perwindow.js
@@ -10,6 +10,7 @@
  * @returns {Promise} The task as a promise
  */
 function test_ntp_theme(browser, theme, isBrightText) {
+  Services.ppmm.sharedData.flush();
   return ContentTask.spawn(browser, {
     isBrightText,
     background: hexToCSS(theme.colors.ntp_background),
@@ -34,6 +35,7 @@ function test_ntp_theme(browser, theme, isBrightText) {
  * @returns {Promise} The task as a promise
  */
 function test_ntp_default_theme(browser) {
+  Services.ppmm.sharedData.flush();
   return ContentTask.spawn(browser, {
     background: hexToCSS("#F9F9FA"),
     color: hexToCSS("#0C0C0D"),
diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm
index f949e5526a99..4518a32a5879 100644
--- a/toolkit/modules/LightweightThemeConsumer.jsm
+++ b/toolkit/modules/LightweightThemeConsumer.jsm
@@ -110,6 +110,7 @@ ChromeUtils.defineModuleGetter(this, "LightweightThemeImageOptimizer",
 function LightweightThemeConsumer(aDocument) {
   this._doc = aDocument;
   this._win = aDocument.defaultView;
+  this._winId = this._win.windowUtils.outerWindowID;
 
   Services.obs.addObserver(this, "lightweight-theme-styling-update");
 
@@ -119,8 +120,6 @@ function LightweightThemeConsumer(aDocument) {
 
   this._win.addEventListener("resolutionchange", this);
   this._win.addEventListener("unload", this, { once: true });
-  this._win.addEventListener("EndSwapDocShells", this, true);
-  this._win.messageManager.addMessageListener("LightweightTheme:Request", this);
 
   let darkThemeMediaQuery = this._win.matchMedia("(-moz-system-dark-theme)");
   darkThemeMediaQuery.addListener(temp.LightweightThemeManager);
@@ -136,27 +135,18 @@ LightweightThemeConsumer.prototype = {
     if (aTopic != "lightweight-theme-styling-update")
       return;
 
-    const { outerWindowID } = this._win.windowUtils;
-
     let parsedData = JSON.parse(aData);
     if (!parsedData) {
       parsedData = { theme: null };
     }
 
-    if (parsedData.window && parsedData.window !== outerWindowID) {
+    if (parsedData.window && parsedData.window !== this._winId) {
       return;
     }
 
     this._update(parsedData.theme);
   },
 
-  receiveMessage({ name, target }) {
-    if (name == "LightweightTheme:Request") {
-      let contentThemeData = _getContentProperties(this._doc, this._active, this._lastData);
-      target.messageManager.sendAsyncMessage("LightweightTheme:Update", contentThemeData);
-    }
-  },
-
   handleEvent(aEvent) {
     switch (aEvent.type) {
       case "resolutionchange":
@@ -166,14 +156,10 @@ LightweightThemeConsumer.prototype = {
         break;
       case "unload":
         Services.obs.removeObserver(this, "lightweight-theme-styling-update");
+        Services.ppmm.sharedData.delete(`theme/${this._winId}`);
         this._win.removeEventListener("resolutionchange", this);
-        this._win.removeEventListener("EndSwapDocShells", this, true);
         this._win = this._doc = null;
         break;
-      case "EndSwapDocShells":
-        let contentThemeData = _getContentProperties(this._doc, this._active, this._lastData);
-        aEvent.target.messageManager.sendAsyncMessage("LightweightTheme:Update", contentThemeData);
-        break;
     }
   },
 
@@ -227,11 +213,7 @@ LightweightThemeConsumer.prototype = {
       root.removeAttribute("lwthemefooter");
 
     let contentThemeData = _getContentProperties(this._doc, active, aData);
-
-    let browserMessageManager = this._win.getGroupMessageManager("browsers");
-    browserMessageManager.broadcastAsyncMessage(
-      "LightweightTheme:Update", contentThemeData
-    );
+    Services.ppmm.sharedData.set(`theme/${this._winId}`, contentThemeData);
   }
 };
 

From e8cb6c18a31930b388d628a3ba02ce7a697c2eaa Mon Sep 17 00:00:00 2001
From: Nicholas Hurley <hurley@mozilla.com>
Date: Fri, 27 Jul 2018 06:35:00 +0000
Subject: [PATCH 28/29] Bug 1468583 - Explicitly tie h2stream to transaction in
 logs for logan. r=valentin

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

--HG--
extra : moz-landing-system : lando
---
 netwerk/protocol/http/Http2Stream.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netwerk/protocol/http/Http2Stream.cpp b/netwerk/protocol/http/Http2Stream.cpp
index e490783746f0..739645832b54 100644
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -80,7 +80,8 @@ Http2Stream::Http2Stream(nsAHttpTransaction *httpTransaction,
 {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
 
-  LOG3(("Http2Stream::Http2Stream %p", this));
+  nsHttpTransaction *trans = mTransaction->QueryHttpTransaction();
+  LOG3(("Http2Stream::Http2Stream %p trans=%p atrans=%p", this, trans, httpTransaction));
 
   mServerReceiveWindow = session->GetServerInitialStreamWindow();
   mClientReceiveWindow = session->PushAllowance();
@@ -104,7 +105,6 @@ Http2Stream::Http2Stream(nsAHttpTransaction *httpTransaction,
   MOZ_ASSERT(httpPriority >= 0);
   SetPriority(static_cast<uint32_t>(httpPriority));
 
-  nsHttpTransaction *trans = mTransaction->QueryHttpTransaction();
   if (trans) {
     mTransactionTabId = trans->TopLevelOuterContentWindowId();
   }

From 778ca4f84f0420a62f1bc8fa4ef89cbc8e0184c2 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Sat, 28 Jul 2018 01:25:25 +0300
Subject: [PATCH 29/29] Backed out 8 changesets (bug 1476405) for causing
 frequent failures in bug 1479022. a=backout

Backed out changeset ad1674e9152d (bug 1476405)
Backed out changeset e0a021b27d2c (bug 1476405)
Backed out changeset 771288dbf852 (bug 1476405)
Backed out changeset aeebad4f2dc3 (bug 1476405)
Backed out changeset 4831cbfd03de (bug 1476405)
Backed out changeset 0b0c243a1827 (bug 1476405)
Backed out changeset 236b366fdf37 (bug 1476405)
Backed out changeset c767b1b618fb (bug 1476405)
---
 dom/media/CubebUtils.cpp                      |   4 -
 .../src/base/platform_thread_posix.cc         |  30 +--
 ipc/chromium/src/base/platform_thread_win.cc  |  28 ++-
 js/src/vm/HelperThreads.cpp                   |   7 +-
 js/xpconnect/src/XPCJSContext.cpp             |   8 +-
 media/audioipc/client/src/context.rs          |  25 +--
 media/audioipc/client/src/lib.rs              |   3 -
 .../BackgroundHangMonitor.cpp                 |   3 +-
 tools/profiler/core/platform.cpp              |   5 -
 xpcom/threads/nsThread.cpp                    | 174 ++++++++----------
 xpcom/threads/nsThread.h                      |  11 --
 xpcom/threads/nsThreadManager.cpp             | 112 ++++-------
 xpcom/threads/nsThreadManager.h               |   4 +-
 13 files changed, 148 insertions(+), 266 deletions(-)

diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index fe2643dd2fc4..ee750011ffff 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -59,7 +59,6 @@ struct AudioIpcInitParams {
   int mServerConnection;
   size_t mPoolSize;
   size_t mStackSize;
-  void (*mThreadCreateCallback)(const char*);
 };
 
 // These functions are provided by audioipc-server crate
@@ -431,9 +430,6 @@ cubeb* GetCubebContextUnlocked()
     initParams.mPoolSize = sAudioIPCPoolSize;
     initParams.mStackSize = sAudioIPCStackSize;
     initParams.mServerConnection = sIPCConnection->ClonePlatformHandle().release();
-    initParams.mThreadCreateCallback = [](const char* aName) {
-      PROFILER_REGISTER_THREAD(aName);
-    };
 
     MOZ_LOG(gCubebLog, LogLevel::Debug, ("%s: %d", PREF_AUDIOIPC_POOL_SIZE, (int) initParams.mPoolSize));
     MOZ_LOG(gCubebLog, LogLevel::Debug, ("%s: %d", PREF_AUDIOIPC_STACK_SIZE, (int) initParams.mStackSize));
diff --git a/ipc/chromium/src/base/platform_thread_posix.cc b/ipc/chromium/src/base/platform_thread_posix.cc
index 1c6410453fcf..21398dc8a5b0 100644
--- a/ipc/chromium/src/base/platform_thread_posix.cc
+++ b/ipc/chromium/src/base/platform_thread_posix.cc
@@ -26,8 +26,6 @@
 #include <pthread_np.h>
 #endif
 
-#include "nsThreadUtils.h"
-
 #if defined(OS_MACOSX)
 namespace base {
 void InitThreading();
@@ -35,10 +33,6 @@ void InitThreading();
 #endif
 
 static void* ThreadFunc(void* closure) {
-  // Create a nsThread wrapper for the current platform thread, and register it
-  // with the thread manager.
-  (void) NS_GetCurrentThread();
-
   PlatformThread::Delegate* delegate =
       static_cast<PlatformThread::Delegate*>(closure);
   delegate->ThreadMain();
@@ -98,10 +92,21 @@ void PlatformThread::SetName(const char* name) {
   if (PlatformThread::CurrentId() == getpid())
     return;
 
-  // Using NS_SetCurrentThreadName, as opposed to using platform APIs directly,
-  // also sets the thread name on the PRThread wrapper, and allows us to
-  // retrieve it using PR_GetThreadName.
-  NS_SetCurrentThreadName(name);
+  // http://0pointer.de/blog/projects/name-your-threads.html
+  // Set the name for the LWP (which gets truncated to 15 characters).
+  // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+  // available everywhere and it's only benefit over using prctl directly is
+  // that it can set the name of threads other than the current thread.
+#if defined(OS_LINUX)
+  prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); 
+#elif defined(OS_NETBSD)
+  pthread_setname_np(pthread_self(), "%s", (void *)name);
+#elif defined(OS_BSD) && !defined(__GLIBC__)
+  pthread_set_name_np(pthread_self(), name);
+#elif defined(OS_SOLARIS)
+  pthread_setname_np(pthread_self(), name);
+#else
+#endif
 }
 #endif // !OS_MACOSX
 
@@ -124,9 +129,8 @@ bool CreateThread(size_t stack_size, bool joinable,
     pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
   }
 
-  if (stack_size == 0)
-    stack_size = nsIThreadManager::DEFAULT_STACK_SIZE;
-  pthread_attr_setstacksize(&attributes, stack_size);
+  if (stack_size > 0)
+    pthread_attr_setstacksize(&attributes, stack_size);
 
   success = !pthread_create(thread_handle, &attributes, ThreadFunc, delegate);
 
diff --git a/ipc/chromium/src/base/platform_thread_win.cc b/ipc/chromium/src/base/platform_thread_win.cc
index 762aa7e305e3..2e7614230624 100644
--- a/ipc/chromium/src/base/platform_thread_win.cc
+++ b/ipc/chromium/src/base/platform_thread_win.cc
@@ -9,8 +9,6 @@
 #include "base/logging.h"
 #include "base/win_util.h"
 
-#include "nsThreadUtils.h"
-
 namespace {
 
 // The information on how to set the thread name comes from
@@ -25,10 +23,6 @@ typedef struct tagTHREADNAME_INFO {
 } THREADNAME_INFO;
 
 DWORD __stdcall ThreadFunc(void* closure) {
-  // Create a nsThread wrapper for the current platform thread, and register it
-  // with the thread manager.
-  (void) NS_GetCurrentThread();
-
   PlatformThread::Delegate* delegate =
       static_cast<PlatformThread::Delegate*>(closure);
   delegate->ThreadMain();
@@ -54,10 +48,24 @@ void PlatformThread::Sleep(int duration_ms) {
 
 // static
 void PlatformThread::SetName(const char* name) {
-  // Using NS_SetCurrentThreadName, as opposed to using platform APIs directly,
-  // also sets the thread name on the PRThread wrapper, and allows us to
-  // retrieve it using PR_GetThreadName.
-  NS_SetCurrentThreadName(name);
+#ifdef HAVE_SEH_EXCEPTIONS
+  // The debugger needs to be around to catch the name in the exception.  If
+  // there isn't a debugger, we are just needlessly throwing an exception.
+  if (!::IsDebuggerPresent())
+    return;
+
+  THREADNAME_INFO info;
+  info.dwType = 0x1000;
+  info.szName = name;
+  info.dwThreadID = CurrentId();
+  info.dwFlags = 0;
+
+  MOZ_SEH_TRY {
+    RaiseException(kVCThreadNameException, 0, sizeof(info)/sizeof(DWORD),
+                   reinterpret_cast<DWORD_PTR*>(&info));
+  } MOZ_SEH_EXCEPT(EXCEPTION_CONTINUE_EXECUTION) {
+  }
+#endif
 }
 
 // static
diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
index 86e0f3b9eceb..ae15f86f5d50 100644
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -943,12 +943,7 @@ js::CurrentThreadIsParseThread()
 }
 #endif
 
-// We want our default stack size limit to be approximately 2MB, to be safe, but
-// expect most threads to use much less. On Linux, however, requesting a stack
-// of 2MB or larger risks the kernel allocating an entire 2MB huge page for it
-// on first access, which we do not want. To avoid this possibility, we subtract
-// 2 standard VM page sizes from our default.
-static const uint32_t kDefaultHelperStackSize = 2048 * 1024 - 2 * 4096;
+static const uint32_t kDefaultHelperStackSize = 2048 * 1024;
 static const uint32_t kDefaultHelperStackQuota = 1800 * 1024;
 
 // TSan enforces a minimum stack size that's just slightly larger than our
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index 59ebfd9079e1..496212d7bbde 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -79,10 +79,6 @@ using namespace xpc;
 using namespace JS;
 using mozilla::dom::AutoEntryScript;
 
-// The watchdog thread loop is pretty trivial, and should not require much stack
-// space to do its job. So only give it 32KiB.
-static constexpr size_t kWatchdogStackSize = 32 * 1024;
-
 static void WatchdogMain(void* arg);
 class Watchdog;
 class WatchdogManager;
@@ -147,7 +143,7 @@ class Watchdog
             // join it on shutdown.
             mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this,
                                       PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-                                      PR_JOINABLE_THREAD, kWatchdogStackSize);
+                                      PR_JOINABLE_THREAD, 0);
             if (!mThread)
                 MOZ_CRASH("PR_CreateThread failed!");
 
@@ -476,8 +472,6 @@ static void
 WatchdogMain(void* arg)
 {
     AUTO_PROFILER_REGISTER_THREAD("JS Watchdog");
-    // Create an nsThread wrapper for the thread and register it with the thread manager.
-    Unused << NS_GetCurrentThread();
     NS_SetCurrentThreadName("JS Watchdog");
 
     Watchdog* self = static_cast<Watchdog*>(arg);
diff --git a/media/audioipc/client/src/context.rs b/media/audioipc/client/src/context.rs
index de3df3fd4f0f..1e3a5311ffa5 100644
--- a/media/audioipc/client/src/context.rs
+++ b/media/audioipc/client/src/context.rs
@@ -20,7 +20,6 @@ use std::os::raw::c_void;
 use std::os::unix::io::FromRawFd;
 use std::os::unix::net;
 use std::sync::mpsc;
-use std::thread;
 use stream;
 use tokio_core::reactor::{Handle, Remote};
 use tokio_uds::UnixStream;
@@ -100,25 +99,9 @@ impl ContextOps for ClientContext {
 
         let (tx_rpc, rx_rpc) = mpsc::channel();
 
-        let params = CPUPOOL_INIT_PARAMS.with(|p| {
-            p.replace(None).unwrap()
-        });
-
-        let thread_create_callback = params.thread_create_callback;
-
-        let register_thread = move || {
-            if let Some(func) = thread_create_callback {
-                let thr = thread::current();
-                let name = CString::new(thr.name().unwrap()).unwrap();
-                func(name.as_ptr());
-            }
-        };
-
         let core = t!(core::spawn_thread("AudioIPC Client RPC", move || {
             let handle = core::handle();
 
-            register_thread();
-
             open_server_stream()
                 .ok()
                 .and_then(|stream| UnixStream::from_stream(stream, &handle).ok())
@@ -133,12 +116,14 @@ impl ContextOps for ClientContext {
 
         let rpc = t!(rx_rpc.recv());
 
-        let cpupool = futures_cpupool::Builder::new()
+        let cpupool = CPUPOOL_INIT_PARAMS.with(|p| {
+            let params = p.replace(None).unwrap();
+            futures_cpupool::Builder::new()
                 .name_prefix("AudioIPC")
-                .after_start(register_thread)
                 .pool_size(params.pool_size)
                 .stack_size(params.stack_size)
-                .create();
+                .create()
+        });
 
         let ctx = Box::new(ClientContext {
             _ops: &CLIENT_OPS as *const _,
diff --git a/media/audioipc/client/src/lib.rs b/media/audioipc/client/src/lib.rs
index 21d5cc0d8a62..f2cd99362d0f 100644
--- a/media/audioipc/client/src/lib.rs
+++ b/media/audioipc/client/src/lib.rs
@@ -37,14 +37,12 @@ pub struct AudioIpcInitParams {
     pub server_connection: c_int,
     pub pool_size: usize,
     pub stack_size: usize,
-    pub thread_create_callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>,
 }
 
 #[derive(Clone, Copy, Debug)]
 struct CpuPoolInitParams {
     pub pool_size: usize,
     pub stack_size: usize,
-    pub thread_create_callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>,
 }
 
 impl CpuPoolInitParams {
@@ -52,7 +50,6 @@ impl CpuPoolInitParams {
         CpuPoolInitParams {
             pool_size: params.pool_size,
             stack_size: params.stack_size,
-            thread_create_callback: params.thread_create_callback,
         }
     }
 }
diff --git a/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp b/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp
index 827e77750b04..f9e7922fe538 100644
--- a/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp
+++ b/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp
@@ -268,8 +268,7 @@ BackgroundHangManager::BackgroundHangManager()
 
   mHangMonitorThread = PR_CreateThread(
     PR_USER_THREAD, MonitorThread, this,
-    PR_PRIORITY_LOW, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD,
-    nsIThreadManager::DEFAULT_STACK_SIZE);
+    PR_PRIORITY_LOW, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
 
   MOZ_ASSERT(mHangMonitorThread, "Failed to create BHR monitor thread");
 
diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
index 5a2404839324..0ef4c807ab32 100644
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -3298,11 +3298,6 @@ profiler_register_thread(const char* aName, void* aGuessStackTop)
   MOZ_ASSERT_IF(NS_IsMainThread(), Scheduler::IsCooperativeThread());
   MOZ_RELEASE_ASSERT(CorePS::Exists());
 
-  // Make sure we have a nsThread wrapper for the current thread, and that NSPR
-  // knows its name.
-  (void) NS_GetCurrentThread();
-  NS_SetCurrentThreadName(aName);
-
   PSAutoLock lock(gPSMutex);
 
   void* stackTop = GetStackTop(aGuessStackTop);
diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp
index b687de9d63cb..8c7d0a6cf8bf 100644
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -405,13 +405,6 @@ nsThread::ThreadList()
   return sList;
 }
 
-/* static */ void
-nsThread::ClearThreadList()
-{
-  OffTheBooksMutexAutoLock mal(ThreadListMutex());
-  while (ThreadList().popFirst()) {}
-}
-
 /* static */ nsThreadEnumerator
 nsThread::Enumerate()
 {
@@ -427,6 +420,7 @@ nsThread::ThreadFunc(void* aArg)
   nsThread* self = initData->thread;  // strong reference
 
   self->mThread = PR_GetCurrentThread();
+  self->mThreadId = uint32_t(PlatformThread::CurrentId());
   self->mVirtualThread = GetCurrentVirtualThread();
   self->mEventTarget->SetCurrentThread();
   SetupCurrentThreadForChaosMode();
@@ -435,7 +429,71 @@ nsThread::ThreadFunc(void* aArg)
     NS_SetCurrentThreadName(initData->name.BeginReading());
   }
 
-  self->InitCommon();
+  {
+#if defined(XP_LINUX)
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_getattr_np(pthread_self(), &attr);
+
+    size_t stackSize;
+    pthread_attr_getstack(&attr, &self->mStackBase, &stackSize);
+
+    // Glibc prior to 2.27 reports the stack size and base including the guard
+    // region, so we need to compensate for it to get accurate accounting.
+    // Also, this behavior difference isn't guarded by a versioned symbol, so we
+    // actually need to check the runtime glibc version, not the version we were
+    // compiled against.
+    static bool sAdjustForGuardSize = ({
+#ifdef __GLIBC__
+      unsigned major, minor;
+      sscanf(gnu_get_libc_version(), "%u.%u", &major, &minor) < 2 ||
+        major < 2 || (major == 2 && minor < 27);
+#else
+      false;
+#endif
+    });
+    if (sAdjustForGuardSize) {
+      size_t guardSize;
+      pthread_attr_getguardsize(&attr, &guardSize);
+
+      // Note: This assumes that the stack grows down, as is the case on all of
+      // our tier 1 platforms. On platforms where the stack grows up, the
+      // mStackBase adjustment is unnecessary, but doesn't cause any harm other
+      // than under-counting stack memory usage by one page.
+      self->mStackBase = reinterpret_cast<char*>(self->mStackBase) + guardSize;
+      stackSize -= guardSize;
+    }
+
+    self->mStackSize = stackSize;
+
+    // This is a bit of a hack.
+    //
+    // We really do want the NOHUGEPAGE flag on our thread stacks, since we
+    // don't expect any of them to need anywhere near 2MB of space. But setting
+    // it here is too late to have an effect, since the first stack page has
+    // already been faulted in existence, and NSPR doesn't give us a way to set
+    // it beforehand.
+    //
+    // What this does get us, however, is a different set of VM flags on our
+    // thread stacks compared to normal heap memory. Which makes the Linux
+    // kernel report them as separate regions, even when they are adjacent to
+    // heap memory. This allows us to accurately track the actual memory
+    // consumption of our allocated stacks.
+    madvise(self->mStackBase, stackSize, MADV_NOHUGEPAGE);
+
+    pthread_attr_destroy(&attr);
+#elif defined(XP_WIN)
+    static const DynamicallyLinkedFunctionPtr<GetCurrentThreadStackLimitsFn>
+      sGetStackLimits(L"kernel32.dll", "GetCurrentThreadStackLimits");
+
+    if (sGetStackLimits) {
+      ULONG_PTR stackBottom, stackTop;
+      sGetStackLimits(&stackBottom, &stackTop);
+      self->mStackBase = reinterpret_cast<void*>(stackBottom);
+      self->mStackSize = stackTop - stackBottom;
+    }
+#endif
+  }
 
   // Inform the ThreadManager
   nsThreadManager::get().RegisterCurrentThread(*self);
@@ -516,81 +574,6 @@ nsThread::ThreadFunc(void* aArg)
   NS_RELEASE(self);
 }
 
-void
-nsThread::InitCommon()
-{
-  mThreadId = uint32_t(PlatformThread::CurrentId());
-
-  {
-#if defined(XP_LINUX)
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_getattr_np(pthread_self(), &attr);
-
-    size_t stackSize;
-    pthread_attr_getstack(&attr, &mStackBase, &stackSize);
-
-    // Glibc prior to 2.27 reports the stack size and base including the guard
-    // region, so we need to compensate for it to get accurate accounting.
-    // Also, this behavior difference isn't guarded by a versioned symbol, so we
-    // actually need to check the runtime glibc version, not the version we were
-    // compiled against.
-    static bool sAdjustForGuardSize = ({
-#ifdef __GLIBC__
-      unsigned major, minor;
-      sscanf(gnu_get_libc_version(), "%u.%u", &major, &minor) < 2 ||
-        major < 2 || (major == 2 && minor < 27);
-#else
-      false;
-#endif
-    });
-    if (sAdjustForGuardSize) {
-      size_t guardSize;
-      pthread_attr_getguardsize(&attr, &guardSize);
-
-      // Note: This assumes that the stack grows down, as is the case on all of
-      // our tier 1 platforms. On platforms where the stack grows up, the
-      // mStackBase adjustment is unnecessary, but doesn't cause any harm other
-      // than under-counting stack memory usage by one page.
-      mStackBase = reinterpret_cast<char*>(mStackBase) + guardSize;
-      stackSize -= guardSize;
-    }
-
-    mStackSize = stackSize;
-
-    // This is a bit of a hack.
-    //
-    // We really do want the NOHUGEPAGE flag on our thread stacks, since we
-    // don't expect any of them to need anywhere near 2MB of space. But setting
-    // it here is too late to have an effect, since the first stack page has
-    // already been faulted in existence, and NSPR doesn't give us a way to set
-    // it beforehand.
-    //
-    // What this does get us, however, is a different set of VM flags on our
-    // thread stacks compared to normal heap memory. Which makes the Linux
-    // kernel report them as separate regions, even when they are adjacent to
-    // heap memory. This allows us to accurately track the actual memory
-    // consumption of our allocated stacks.
-    madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
-
-    pthread_attr_destroy(&attr);
-#elif defined(XP_WIN)
-    static const DynamicallyLinkedFunctionPtr<GetCurrentThreadStackLimitsFn>
-      sGetStackLimits(L"kernel32.dll", "GetCurrentThreadStackLimits");
-
-    if (sGetStackLimits) {
-      ULONG_PTR stackBottom, stackTop;
-      sGetStackLimits(&stackBottom, &stackTop);
-      mStackBase = reinterpret_cast<void*>(stackBottom);
-      mStackSize = stackTop - stackBottom;
-    }
-#endif
-  }
-
-  OffTheBooksMutexAutoLock mal(ThreadListMutex());
-  ThreadList().insertBack(this);
-}
-
 //-----------------------------------------------------------------------------
 
 // Tell the crash reporter to save a memory report if our heuristics determine
@@ -687,17 +670,7 @@ nsThread::~nsThread()
 {
   NS_ASSERTION(mRequestedShutdownContexts.IsEmpty(),
                "shouldn't be waiting on other threads to shutdown");
-
-  // We shouldn't need to lock before checking isInList at this point. We're
-  // destroying the last reference to this object, so there's no way for anyone
-  // else to remove it in the middle of our check. And the not-in-list state is
-  // determined the element's next and previous members pointing to itself, so a
-  // non-atomic update to an adjacent member won't affect the outcome either.
-  if (isInList()) {
-    OffTheBooksMutexAutoLock mal(ThreadListMutex());
-    removeFrom(ThreadList());
-  }
-
+  MOZ_ASSERT(!isInList());
 #ifdef DEBUG
   // We deliberately leak these so they can be tracked by the leak checker.
   // If you're having nsThreadShutdownContext leaks, you can set:
@@ -731,6 +704,11 @@ nsThread::Init(const nsACString& aName)
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
+  {
+    OffTheBooksMutexAutoLock mal(ThreadListMutex());
+    ThreadList().insertBack(this);
+  }
+
   // ThreadFunc will wait for this event to be run before it tries to access
   // mThread.  By delaying insertion of this event into the queue, we ensure
   // that mThread is set properly.
@@ -750,7 +728,6 @@ nsThread::InitCurrentThread()
   mThread = PR_GetCurrentThread();
   mVirtualThread = GetCurrentVirtualThread();
   SetupCurrentThreadForChaosMode();
-  InitCommon();
 
   nsThreadManager::get().RegisterCurrentThread(*this);
   return NS_OK;
@@ -879,13 +856,6 @@ nsThread::ShutdownComplete(NotNull<nsThreadShutdownContext*> aContext)
   MOZ_ASSERT(mThread);
   MOZ_ASSERT(aContext->mTerminatingThread == this);
 
-  {
-    OffTheBooksMutexAutoLock mal(ThreadListMutex());
-    if (isInList()) {
-      removeFrom(ThreadList());
-    }
-  }
-
   if (aContext->mAwaitingShutdownAck) {
     // We're in a synchronous shutdown, so tell whatever is up the stack that
     // we're done and unwind the stack so it can call us again.
diff --git a/xpcom/threads/nsThread.h b/xpcom/threads/nsThread.h
index 776be874ba7e..ad018197ea8b 100644
--- a/xpcom/threads/nsThread.h
+++ b/xpcom/threads/nsThread.h
@@ -66,12 +66,6 @@ public:
   // Initialize this as a wrapper for the current PRThread.
   nsresult InitCurrentThread();
 
-private:
-  // Initializes the mThreadId and stack base/size members, and adds the thread
-  // to the ThreadList().
-  void InitCommon();
-
-public:
   // The PRThread corresponding to this thread.
   PRThread* GetPRThread()
   {
@@ -176,11 +170,8 @@ protected:
 
   struct nsThreadShutdownContext* ShutdownInternal(bool aSync);
 
-  friend class nsThreadManager;
-
   static mozilla::OffTheBooksMutex& ThreadListMutex();
   static mozilla::LinkedList<nsThread>& ThreadList();
-  static void ClearThreadList();
 
   RefPtr<mozilla::SynchronizedEventQueue> mEvents;
   RefPtr<mozilla::ThreadEventTarget> mEventTarget;
@@ -214,8 +205,6 @@ protected:
   // Set to true if this thread creates a JSRuntime.
   bool mCanInvokeJS;
 
-  bool mHasTLSEntry = false;
-
   // Used to track which event is being executed by ProcessNextEvent
   nsCOMPtr<nsIRunnable> mCurrentEvent;
 
diff --git a/xpcom/threads/nsThreadManager.cpp b/xpcom/threads/nsThreadManager.cpp
index 0a5745fc8ae5..b8b9af2ea7bd 100644
--- a/xpcom/threads/nsThreadManager.cpp
+++ b/xpcom/threads/nsThreadManager.cpp
@@ -94,27 +94,12 @@ AssertIsOnMainThread()
 
 typedef nsTArray<NotNull<RefPtr<nsThread>>> nsThreadArray;
 
-static bool sShutdownComplete;
-
 //-----------------------------------------------------------------------------
 
-/* static */ void
-nsThreadManager::ReleaseThread(void* aData)
+static void
+ReleaseObject(void* aData)
 {
-  if (sShutdownComplete) {
-    // We've already completed shutdown and released the references to all or
-    // our TLS wrappers. Don't try to release them again.
-    return;
-  }
-
-  auto* thread = static_cast<nsThread*>(aData);
-
-  get().UnregisterCurrentThread(*thread, true);
-
-  if (thread->mHasTLSEntry) {
-    thread->mHasTLSEntry = false;
-    thread->Release();
-  }
+  static_cast<nsISupports*>(aData)->Release();
 }
 
 // statically allocated instance
@@ -251,7 +236,7 @@ nsThreadManager::Init()
 
   Scheduler::EventLoopActivation::Init();
 
-  if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseThread) == PR_FAILURE) {
+  if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) {
     return NS_ERROR_FAILURE;
   }
 
@@ -319,34 +304,32 @@ nsThreadManager::Shutdown()
   // Empty the main thread event queue before we begin shutting down threads.
   NS_ProcessPendingEvents(mMainThread);
 
+  // We gather the threads from the hashtable into a list, so that we avoid
+  // holding the hashtable lock while calling nsIThread::Shutdown.
+  nsThreadArray threads;
   {
-    // We gather the threads from the hashtable into a list, so that we avoid
-    // holding the hashtable lock while calling nsIThread::Shutdown.
-    nsThreadArray threads;
-    {
-      OffTheBooksMutexAutoLock lock(mLock);
-      for (auto iter = mThreadsByPRThread.Iter(); !iter.Done(); iter.Next()) {
-        RefPtr<nsThread>& thread = iter.Data();
-        threads.AppendElement(WrapNotNull(thread));
-        iter.Remove();
-      }
+    OffTheBooksMutexAutoLock lock(mLock);
+    for (auto iter = mThreadsByPRThread.Iter(); !iter.Done(); iter.Next()) {
+      RefPtr<nsThread>& thread = iter.Data();
+      threads.AppendElement(WrapNotNull(thread));
+      iter.Remove();
     }
+  }
 
-    // It's tempting to walk the list of threads here and tell them each to stop
-    // accepting new events, but that could lead to badness if one of those
-    // threads is stuck waiting for a response from another thread.  To do it
-    // right, we'd need some way to interrupt the threads.
-    //
-    // Instead, we process events on the current thread while waiting for threads
-    // to shutdown.  This means that we have to preserve a mostly functioning
-    // world until such time as the threads exit.
+  // It's tempting to walk the list of threads here and tell them each to stop
+  // accepting new events, but that could lead to badness if one of those
+  // threads is stuck waiting for a response from another thread.  To do it
+  // right, we'd need some way to interrupt the threads.
+  //
+  // Instead, we process events on the current thread while waiting for threads
+  // to shutdown.  This means that we have to preserve a mostly functioning
+  // world until such time as the threads exit.
 
-    // Shutdown all threads that require it (join with threads that we created).
-    for (uint32_t i = 0; i < threads.Length(); ++i) {
-      NotNull<nsThread*> thread = threads[i];
-      if (thread->ShutdownRequired()) {
-        thread->Shutdown();
-      }
+  // Shutdown all threads that require it (join with threads that we created).
+  for (uint32_t i = 0; i < threads.Length(); ++i) {
+    NotNull<nsThread*> thread = threads[i];
+    if (thread->ShutdownRequired()) {
+      thread->Shutdown();
     }
   }
 
@@ -377,24 +360,6 @@ nsThreadManager::Shutdown()
 
   // Remove the TLS entry for the main thread.
   PR_SetThreadPrivate(mCurThreadIndex, nullptr);
-
-  {
-    // Cleanup the last references to any threads which haven't shut down yet.
-    nsTArray<RefPtr<nsThread>> threads;
-    for (auto* thread : nsThread::Enumerate()) {
-      if (thread->mHasTLSEntry) {
-        threads.AppendElement(dont_AddRef(thread));
-        thread->mHasTLSEntry = false;
-      }
-    }
-  }
-
-  // xpcshell tests sometimes leak the main thread. They don't enable leak
-  // checking, so that doesn't cause the test to fail, but leaving the entry in
-  // the thread list triggers an assertion, which does.
-  nsThread::ClearThreadList();
-
-  sShutdownComplete = true;
 }
 
 void
@@ -412,28 +377,21 @@ nsThreadManager::RegisterCurrentThread(nsThread& aThread)
   mThreadsByPRThread.Put(aThread.GetPRThread(), &aThread);  // XXX check OOM?
 
   aThread.AddRef();  // for TLS entry
-  aThread.mHasTLSEntry = true;
   PR_SetThreadPrivate(mCurThreadIndex, &aThread);
 }
 
 void
-nsThreadManager::UnregisterCurrentThread(nsThread& aThread, bool aIfExists)
+nsThreadManager::UnregisterCurrentThread(nsThread& aThread)
 {
   MOZ_ASSERT(aThread.GetPRThread() == PR_GetCurrentThread(), "bad aThread");
 
-  {
-    OffTheBooksMutexAutoLock lock(mLock);
+  OffTheBooksMutexAutoLock lock(mLock);
 
-    if (aIfExists && !mThreadsByPRThread.GetWeak(aThread.GetPRThread())) {
-      return;
-    }
-
-    --mCurrentNumberOfThreads;
-    mThreadsByPRThread.Remove(aThread.GetPRThread());
-  }
+  --mCurrentNumberOfThreads;
+  mThreadsByPRThread.Remove(aThread.GetPRThread());
 
   PR_SetThreadPrivate(mCurThreadIndex, nullptr);
-  // Ref-count balanced via ReleaseThread
+  // Ref-count balanced via ReleaseObject
 }
 
 nsThread*
@@ -483,13 +441,7 @@ nsThreadManager::GetCurrentThread()
 bool
 nsThreadManager::IsNSThread() const
 {
-  if (!mInitialized) {
-    return false;
-  }
-  if (auto* thread = (nsThread*)PR_GetThreadPrivate(mCurThreadIndex)) {
-    return thread->mShutdownRequired;
-  }
-  return false;
+  return mInitialized && !!PR_GetThreadPrivate(mCurThreadIndex);
 }
 
 NS_IMETHODIMP
diff --git a/xpcom/threads/nsThreadManager.h b/xpcom/threads/nsThreadManager.h
index dd936be11081..b917133215ae 100644
--- a/xpcom/threads/nsThreadManager.h
+++ b/xpcom/threads/nsThreadManager.h
@@ -36,7 +36,7 @@ public:
 
   // Called by nsThread to inform the ThreadManager it is going away.  This
   // method must be called when the given thread is the current thread.
-  void UnregisterCurrentThread(nsThread& aThread, bool aIfExists = false);
+  void UnregisterCurrentThread(nsThread& aThread);
 
   // Returns the current thread.  Returns null if OOM or if ThreadManager isn't
   // initialized.  Creates the nsThread if one does not exist yet.
@@ -85,8 +85,6 @@ private:
   SpinEventLoopUntilInternal(nsINestedEventLoopCondition* aCondition,
                              bool aCheckingShutdown);
 
-  static void ReleaseThread(void* aData);
-
   nsRefPtrHashtable<nsPtrHashKey<PRThread>, nsThread> mThreadsByPRThread;
   unsigned            mCurThreadIndex;  // thread-local-storage index
   RefPtr<nsThread>  mMainThread;