sync with release and reshuffle

frg/work-js/mozilla-release/patches/1102240-1-60a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1516963788 -3600
 # Node ID 4c42b9b8bd98c6f378f94a6fc896d4a58964ec67
-# Parent  cfd72003d4f5d48938117a1decd2b3f78e403565
+# Parent  1d6061d968090872c1d6d31a38975b0704e5461c
 Bug 1102240 - Move inspector actor to dedicated folder;r=pbro
 
 MozReview-Commit-ID: LNgHweYJXcB
@@ -118,14 +118,14 @@ new file mode 100644
 diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
 --- a/devtools/server/actors/moz.build
 +++ b/devtools/server/actors/moz.build
-@@ -1,16 +1,17 @@
- # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+@@ -2,16 +2,17 @@
  # vim: set filetype=python:
  # 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/.
  
  DIRS += [
+     'emulation',
      'highlighters',
 +    'inspector',
      'utils',
@@ -136,7 +136,7 @@ diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
      'accessibility.js',
      'actor-registry.js',
      'addon.js',
-@@ -30,17 +31,16 @@ DevToolsModules(
+@@ -31,17 +32,16 @@ DevToolsModules(
      'environment.js',
      'errordocs.js',
      'frame.js',
@@ -149,12 +149,12 @@ diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
      'layout.js',
      'memory.js',
      'object.js',
+     'perf.js',
      'performance-recording.js',
      'performance.js',
      'preference.js',
      'pretty-print-worker.js',
-     'process.js',
-@@ -74,19 +74,16 @@ with Files('breakpoint.js'):
+@@ -76,19 +76,16 @@ with Files('breakpoint.js'):
      BUG_COMPONENT = ('Firefox', 'Developer Tools: Debugger')
  
  with Files('css-properties.js'):
@@ -199,7 +199,7 @@ diff --git a/devtools/server/actors/webextension-inspected-window.js b/devtools/
 diff --git a/devtools/server/main.js b/devtools/server/main.js
 --- a/devtools/server/main.js
 +++ b/devtools/server/main.js
-@@ -435,17 +435,17 @@ var DebuggerServer = {
+@@ -444,17 +444,17 @@ var DebuggerServer = {
     * Install tab actors.
     */
    _addTabActors() {
@@ -283,7 +283,7 @@ diff --git a/devtools/server/tests/mochitest/test_inspector-anonymous.html b/dev
    const isStylo = SpecialPowers.DOMWindowUtils.isStyledByServo;
  
    SpecialPowers.pushPrefEnv({"set": [
-     ["dom.webcomponents.enabled", true]
+     ["dom.webcomponents.shadowdom.enabled", true]
 diff --git a/devtools/server/tests/mochitest/test_inspector-insert.html b/devtools/server/tests/mochitest/test_inspector-insert.html
 --- a/devtools/server/tests/mochitest/test_inspector-insert.html
 +++ b/devtools/server/tests/mochitest/test_inspector-insert.html

frg/work-js/mozilla-release/patches/1102240-2-60a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1516968718 -3600
 # Node ID 8e3c63c83301f63943e08a4a4284ee28bb1b1ee9
-# Parent  a2bdaced1343b9f08555f7b5cedd42b3f2bd6da0
+# Parent  f47ceff8a426244e4aa770f9b28fb8e1074b4e30
 Bug 1102240 - split inspector actor in smaller files;r=ochameau,pbro
 
 MozReview-Commit-ID: LgZav4dMQRR
@@ -14313,7 +14313,7 @@ diff --git a/devtools/server/tests/mochitest/test_inspector-anonymous.html b/dev
    const isStylo = SpecialPowers.DOMWindowUtils.isStyledByServo;
  
    SpecialPowers.pushPrefEnv({"set": [
-     ["dom.webcomponents.enabled", true]
+     ["dom.webcomponents.shadowdom.enabled", true]
 diff --git a/devtools/server/tests/mochitest/test_inspector-insert.html b/devtools/server/tests/mochitest/test_inspector-insert.html
 --- a/devtools/server/tests/mochitest/test_inspector-insert.html
 +++ b/devtools/server/tests/mochitest/test_inspector-insert.html

frg/work-js/mozilla-release/patches/1134540-60a1.patch

@@ -2,7 +2,7 @@
 # User Masayuki Nakano <masayuki@d-toybox.com>
 # Date 1517317544 -32400
 # Node ID e5450e8bff0463959ef5cb8d2e7de8f908a79bb8
-# Parent  ad04c68198a01edca781c6cd08ecd3df5f51b560
+# Parent  ec0ea9d3c3e1a2a8adba0843fc44df3f204cf9eb
 Bug 1134540 - Make all tests stop using nsIDOMWindowUtils.sendKeyEvent() r=smaug
 
 nsIDOMWindowUtils.sendKeyEvent() can dispatch any keyboard events, i.e.,
@@ -183,7 +183,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
      children: [{
 -      xpath: {"/xhtml:html/xhtml:body/xhtml:input": "M"},
 +      xpath: {"/xhtml:html/xhtml:body/xhtml:input": "m"},
-       url: "data:text/html;charset=utf-8,<input autofocus=true>"
+       url: "data:text/html;charset=utf-8,<input%20autofocus=true>"
      }]
    };
  
@@ -197,7 +197,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
 +  await BrowserTestUtils.synthesizeKey("m", {code: "KeyM"}, browser);
  
    // Remove the tab and check that we stored form data correctly.
-   await promiseRemoveTabAndSessionState(tab);
+   await promiseRemoveTab(tab);
    let [{state: {formdata}}] = JSON.parse(ss.getClosedTabData(window));
    is(JSON.stringify(formdata), JSON.stringify(FORM_DATA),
      "formdata for iframe stored correctly");
@@ -216,7 +216,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
 +  await BrowserTestUtils.synthesizeKey("m", {code: "KeyM"}, browser);
  
    // Close and restore the tab.
-   await promiseRemoveTabAndSessionState(tab);
+   await promiseRemoveTab(tab);
    tab = ss.undoCloseTab(window, 0);
    browser = tab.linkedBrowser;
    await promiseTabRestored(tab);
@@ -228,7 +228,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
    is(html, expected, "editable document has been restored correctly");
  
    // Close and restore the tab.
-   await promiseRemoveTabAndSessionState(tab);
+   await promiseRemoveTab(tab);
    tab = ss.undoCloseTab(window, 0);
    browser = tab.linkedBrowser;
    await promiseTabRestored(tab);
@@ -1131,7 +1131,7 @@ diff --git a/browser/extensions/formautofill/test/mochitest/test_on_address_subm
  <body>
  Form autofill test: check if address is saved/updated correctly
  
-@@ -69,17 +70,17 @@ add_task(async function check_storage_af
+@@ -67,17 +68,17 @@ add_task(async function check_storage_af
    addressesInMenu.push(TEST_ADDRESSES[0]);
  
    // let expectedAddresses = TEST_ADDRESSES.slice(0);
@@ -1150,7 +1150,7 @@ diff --git a/browser/extensions/formautofill/test/mochitest/test_on_address_subm
  
  // Submit another new address that is mergeable.
  add_task(async function new_address_submitted_and_merged() {
-@@ -104,20 +105,20 @@ add_task(async function new_address_subm
+@@ -102,20 +103,20 @@ add_task(async function new_address_subm
  // Submit an updated autofill address and merge.
  add_task(async function check_storage_after_form_submitted() {
    document.querySelector("form").reset();

frg/work-js/mozilla-release/patches/1179820-4-58a1.patch

@@ -2,7 +2,7 @@
 # User Tom Tromey <tom@tromey.com>
 # Date 1506692190 21600
 # Node ID 1a2618da581f5a592a89406e818620441897e217
-# Parent  827dc9708aa84b4bf947c7061e1de3a8fa5d8464
+# Parent  3c9ce2e88b2ef8740fc4d253b4b9440a8fa02668
 Bug 1179820 - Convert style editor to client-side source maps; r=gl
 
 MozReview-Commit-ID: CV53VKKZz4A
@@ -44,7 +44,7 @@ diff --git a/devtools/client/styleeditor/StyleEditorUI.jsm b/devtools/client/sty
  const {KeyCodes} = require("devtools/client/shared/keycodes");
 +const {OriginalSource} = require("devtools/client/styleeditor/original-source");
  
- loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign");
+ loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsive.html/manager", true);
  
  const LOAD_ERROR = "error-load";
  const STYLE_EDITOR_TEMPLATE = "stylesheet";

frg/work-js/mozilla-release/patches/1230373-3a-58a1.patch

@@ -2,7 +2,7 @@
 # User Mark Banner <standard8@mozilla.com>
 # Date 1507733031 -3600
 # Node ID c072884b1b905a6e00f756c7d3697df3447e7b63
-# Parent  fe1bf993db306dd55c9d7942e30fa9cd92e750dd
+# Parent  35f7b19b0acf26f198ac94fc1cf6bbc337ed2975
 Bug 1230373 - Enable mozilla/use-services for browser/components/ r=mossop
 
 MozReview-Commit-ID: 9m9iss3jUJJ
@@ -28,7 +28,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
  // Constants & Enumeration Values
  const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
  const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
-@@ -104,31 +103,25 @@ var gMainPane = {
+@@ -117,31 +116,25 @@ var gMainPane = {
    // Convenience & Performance Shortcuts
  
    // These get defined by init().
@@ -60,7 +60,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
        document.getElementById(aId)
                .addEventListener(aEventType, aCallback.bind(gMainPane));
      }
-@@ -183,19 +176,17 @@ var gMainPane = {
+@@ -196,19 +189,17 @@ var gMainPane = {
      this._updateUseCurrentButton();
      window.addEventListener("focus", this._updateUseCurrentButton.bind(this));
  
@@ -81,7 +81,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
      // The "closing multiple tabs" and "opening multiple tabs might slow down
      // &brandShortName;" warnings provide options for not showing these
      // warnings again. When the user disabled them, we provide checkboxes to
-@@ -341,30 +332,30 @@ var gMainPane = {
+@@ -354,32 +345,32 @@ var gMainPane = {
      this._brandShortName =
        document.getElementById("bundleBrand").getString("brandShortName");
      this._prefsBundle = document.getElementById("bundlePreferences");
@@ -90,6 +90,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
  
      // Observe preferences that influence what we display so we can rebuild
      // the view when they change.
+-    this._prefSvc.addObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
+-    this._prefSvc.addObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
 -    this._prefSvc.addObserver(PREF_FEED_SELECTED_APP, this);
 -    this._prefSvc.addObserver(PREF_FEED_SELECTED_WEB, this);
 -    this._prefSvc.addObserver(PREF_FEED_SELECTED_ACTION, this);
@@ -104,6 +106,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
 -    this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
 -    this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
 -    this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
++    Services.prefs.addObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
++    Services.prefs.addObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
 +    Services.prefs.addObserver(PREF_FEED_SELECTED_APP, this);
 +    Services.prefs.addObserver(PREF_FEED_SELECTED_WEB, this);
 +    Services.prefs.addObserver(PREF_FEED_SELECTED_ACTION, this);
@@ -126,7 +130,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
        gMainPane.onSelectionChanged);
      setEventListener("typeColumn", "click", gMainPane.sort);
      setEventListener("actionColumn", "click", gMainPane.sort);
-@@ -408,19 +399,17 @@ var gMainPane = {
+@@ -423,19 +414,17 @@ var gMainPane = {
      appendSearchKeywords("browserContainersSettings", [
        browserBundle.getString("userContextPersonal.label"),
        browserBundle.getString("userContextWork.label"),
@@ -147,7 +151,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
    initBrowserContainers() {
      if (!Services.prefs.getBoolPref("privacy.userContext.ui.enabled")) {
        // The browserContainersGroup element has its own internal padding that
-@@ -486,19 +475,17 @@ var gMainPane = {
+@@ -501,19 +490,17 @@ var gMainPane = {
            createOrRemoveSpecialDevEditionFile();
        }
      }
@@ -168,7 +172,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
              win.openUILinkIn("about:preferences#sync", "current");
              return;
            }
-@@ -627,19 +614,17 @@ var gMainPane = {
+@@ -642,19 +629,17 @@ var gMainPane = {
      useCurrent.disabled = !tabs.length;
    },
  
@@ -189,7 +193,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
        tabs = win.gBrowser.visibleTabs.slice(win.gBrowser._numPinnedTabs);
        tabs = tabs.filter(this.isNotAboutPreferences);
      }
-@@ -1186,30 +1171,30 @@ var gMainPane = {
+@@ -1201,32 +1186,32 @@ var gMainPane = {
     * Displays the history of installed updates.
     */
    showUpdates() {
@@ -198,6 +202,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
  
    destroy() {
      window.removeEventListener("unload", this);
+-    this._prefSvc.removeObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
+-    this._prefSvc.removeObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
 -    this._prefSvc.removeObserver(PREF_FEED_SELECTED_APP, this);
 -    this._prefSvc.removeObserver(PREF_FEED_SELECTED_WEB, this);
 -    this._prefSvc.removeObserver(PREF_FEED_SELECTED_ACTION, this);
@@ -212,6 +218,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
 -    this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
 -    this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
 -    this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
++    Services.prefs.removeObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
++    Services.prefs.removeObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
 +    Services.prefs.removeObserver(PREF_FEED_SELECTED_APP, this);
 +    Services.prefs.removeObserver(PREF_FEED_SELECTED_WEB, this);
 +    Services.prefs.removeObserver(PREF_FEED_SELECTED_ACTION, this);
@@ -231,10 +239,10 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
  
    // nsISupports
  
-   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsIDOMEventListener]),
  
    // nsIObserver
-@@ -1984,34 +1969,34 @@ var gMainPane = {
+@@ -2097,34 +2082,34 @@ var gMainPane = {
      if (aHandlerApp instanceof Ci.nsIWebContentHandlerInfo)
        return this._getIconURLForWebApp(aHandlerApp.uri);
  
@@ -272,7 +280,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
    _getIconURLForSystemDefault(aHandlerInfo) {
      // Handler info objects for MIME types on some OSes implement a property bag
      // interface from which we can get an icon for the default app, so if we're
-@@ -2221,19 +2206,17 @@ var gMainPane = {
+@@ -2334,19 +2319,17 @@ var gMainPane = {
  
    async displayDownloadDirPrefTask() {
      var folderListPref = document.getElementById("browser.download.folderList");
@@ -293,7 +301,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
        // When user has selected cloud storage, use value in currentDirPref to
        // compute index to display download folder label and icon to avoid
        // displaying blank downloadFolder label and icon on load of preferences UI
-@@ -2274,19 +2257,17 @@ var gMainPane = {
+@@ -2387,19 +2370,17 @@ var gMainPane = {
     * the XPCOM directory service via the download manager's attribute
     * defaultDownloadsDirectory.
     *
@@ -314,7 +322,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
    },
  
    /**
-@@ -2414,19 +2395,16 @@ HandlerInfoWrapper.prototype = {
+@@ -2527,19 +2508,16 @@ HandlerInfoWrapper.prototype = {
    wrappedHandlerInfo: null,
  
  
@@ -381,7 +389,7 @@ diff --git a/browser/components/preferences/in-content-new/preferences.js b/brow
 diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/components/preferences/in-content-new/privacy.js
 --- a/browser/components/preferences/in-content-new/privacy.js
 +++ b/browser/components/preferences/in-content-new/privacy.js
-@@ -273,19 +273,17 @@ var gPrivacyPane = {
+@@ -289,19 +289,17 @@ var gPrivacyPane = {
      ]);
      appendSearchKeywords("siteDataSettings", [
        bundlePrefs.getString("siteDataSettings2.description"),
@@ -402,7 +410,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
     * Selects the right item of the Tracking Protection radiogroup.
     */
    trackingProtectionReadPrefs() {
-@@ -533,19 +531,17 @@ var gPrivacyPane = {
+@@ -549,19 +547,17 @@ var gPrivacyPane = {
          // We're performing a revert. Just let it happen.
          return;
        }
@@ -423,7 +431,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
        if (this._lastCheckState) {
          autoStart.checked = "checked";
        } else {
-@@ -961,22 +957,20 @@ var gPrivacyPane = {
+@@ -977,22 +973,20 @@ var gPrivacyPane = {
     * Displays the "remove master password" dialog to allow the user to remove
     * the current master password.  When the dialog is dismissed, master password
     * UI is automatically updated.
@@ -452,7 +460,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
 diff --git a/browser/components/preferences/in-content-new/sync.js b/browser/components/preferences/in-content-new/sync.js
 --- a/browser/components/preferences/in-content-new/sync.js
 +++ b/browser/components/preferences/in-content-new/sync.js
-@@ -144,19 +144,17 @@ var gSyncPane = {
+@@ -151,19 +151,17 @@ var gSyncPane = {
  
      fxAccounts.promiseAccountsManageURI(this._getEntryPoint()).then(accountsManageURI => {
        document.getElementById("verifiedManage").setAttribute("href", accountsManageURI);

frg/work-js/mozilla-release/patches/1241131-1-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1512065324 -3600
 # Node ID 6a45e2f79b263153a4cea41c7c5bc111bfa09f18
-# Parent  a4ec8437da2fc81f725c83a9790c24c1b82e7476
+# Parent  fb7896d82a9f9251571b271b936322652ac06fcf
 Bug 1241131 - Remove DevTools reload addon;r=ochameau
 
 MozReview-Commit-ID: GCS4ZRvwUcs
@@ -11,7 +11,7 @@ diff --git a/devtools/bootstrap.js b/devtools/bootstrap.js
 deleted file mode 100644
 --- a/devtools/bootstrap.js
 +++ /dev/null
-@@ -1,340 +0,0 @@
+@@ -1,343 +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/. */
@@ -133,6 +133,7 @@ deleted file mode 100644
 -function setPrefs() {
 -  processPrefFile(resourceURI.spec + "./client/preferences/devtools.js");
 -  processPrefFile(resourceURI.spec + "./client/preferences/debugger.js");
+-  processPrefFile(resourceURI.spec + "./client/webide/webide-prefs.js");
 -}
 -
 -// Helper to listen to a key on all windows
@@ -290,6 +291,8 @@ deleted file mode 100644
 -          }
 -        }, false);
 -      }
+-    } else if (windowtype === "devtools:webide") {
+-      window.location.reload();
 -    }
 -  }
 -
@@ -356,13 +359,16 @@ diff --git a/devtools/chrome.manifest b/devtools/chrome.manifest
 deleted file mode 100644
 --- a/devtools/chrome.manifest
 +++ /dev/null
-@@ -1,6 +0,0 @@
+@@ -1,9 +0,0 @@
 -content devtools client/
 -skin devtools classic/1.0 client/themes/
 -resource devtools .
 -locale devtools en-US client/locales/en-US/
 -locale devtools-shared en-US shared/locales/en-US/
 -locale devtools-shim en-US shim/locales/en-US/
+-
+-content webide client/webide/content/
+-skin webide classic/1.0 client/webide/themes/
 diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm
 --- a/devtools/client/framework/gDevTools.jsm
 +++ b/devtools/client/framework/gDevTools.jsm
@@ -387,8 +393,8 @@ diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework
    // Used by Addon SDK and /devtools
    "closeToolbox",
    "getToolbox",
-@@ -128,17 +124,17 @@ let gDevToolsBrowserMethods = [
-   "openConnectScreen",
+@@ -132,17 +128,17 @@ let gDevToolsBrowserMethods = [
+   "openWebIDE",
  
    // Used by browser-sets.inc, command
    "openContentProcessToolbox",
@@ -404,15 +410,15 @@ diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework
    "forgetBrowserWindow"
  ];
  this.gDevToolsBrowser = {
-   // Used by a test (should be removed)
-   get _trackedBrowserWindows() {
+   // Used by webide.js
+   get isWebIDEInitialized() {
 diff --git a/devtools/client/shared/telemetry.js b/devtools/client/shared/telemetry.js
 --- a/devtools/client/shared/telemetry.js
 +++ b/devtools/client/shared/telemetry.js
-@@ -158,22 +158,16 @@ Telemetry.prototype = {
-     aboutdebugging: {
-       histogram: "DEVTOOLS_ABOUTDEBUGGING_OPENED_COUNT",
-       timerHistogram: "DEVTOOLS_ABOUTDEBUGGING_TIME_ACTIVE_SECONDS"
+@@ -168,22 +168,16 @@ Telemetry.prototype = {
+     },
+     webideImportProject: {
+       histogram: "DEVTOOLS_WEBIDE_IMPORT_PROJECT_COUNT",
      },
      custom: {
        histogram: "DEVTOOLS_CUSTOM_OPENED_COUNT",

frg/work-js/mozilla-release/patches/1286861-2-61a1.patch

@@ -2,7 +2,7 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1523209969 -7200
 # Node ID 59818b273bffc60f7fd561b253ab83d2925579cf
-# Parent  da5028a5ca7677cb6d8df18c67c22df4e99ab8e7
+# Parent  1e60dd442b2120b98f12c2ba49f287616e4b7fc7
 Bug 1286861: Add tests for same site subrequests. r=mgoodwin
 
 diff --git a/dom/security/test/general/file_same_site_cookies_subrequest.sjs b/dom/security/test/general/file_same_site_cookies_subrequest.sjs
@@ -88,8 +88,7 @@ new file mode 100644
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -1,14 +1,16 @@
- [DEFAULT]
+@@ -2,20 +2,22 @@
  support-files =
    file_contentpolicytype_targeted_link_iframe.sjs
    file_nosniff_testserver.sjs
@@ -97,6 +96,7 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
    file_block_toplevel_data_navigation.html
    file_block_toplevel_data_navigation2.html
    file_block_toplevel_data_navigation3.html
+   file_block_toplevel_data_redirect.sjs
 +  file_same_site_cookies_subrequest.sjs
  
  [test_contentpolicytype_targeted_link_iframe.html]
@@ -104,6 +104,12 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
  [test_block_script_wrong_mime.html]
  [test_block_toplevel_data_navigation.html]
  skip-if = toolkit == 'android' # intermittent failure
+ [test_block_toplevel_data_img_navigation.html]
+ skip-if = toolkit == 'android' # intermittent failure
+ [test_allow_opening_data_pdf.html]
+ skip-if = toolkit == 'android'
+ [test_allow_opening_data_json.html]
+ skip-if = toolkit == 'android'
 +[test_same_site_cookies_subrequest.html]
 diff --git a/dom/security/test/general/test_same_site_cookies_subrequest.html b/dom/security/test/general/test_same_site_cookies_subrequest.html
 new file mode 100644

frg/work-js/mozilla-release/patches/1286861-3-61a1.patch

@@ -2,7 +2,7 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1523209988 -7200
 # Node ID 525e7c6d62dead02bfd4887aee6ae9bc983939a0
-# Parent  bfb17b8caf39d1ea5c52244e7bdc652f2912ffe6
+# Parent  4d722ac90e3e11f2dff532a9ba3ddb7b9b7c9190
  Bug 1286861: Add tests for same site top-level. r=mgoodwin
 
 diff --git a/dom/security/test/general/file_same_site_cookies_toplevel_nav.sjs b/dom/security/test/general/file_same_site_cookies_toplevel_nav.sjs
@@ -100,14 +100,14 @@ new file mode 100644
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -2,15 +2,17 @@
- support-files =
+@@ -3,21 +3,23 @@ support-files =
    file_contentpolicytype_targeted_link_iframe.sjs
    file_nosniff_testserver.sjs
    file_block_script_wrong_mime_server.sjs
    file_block_toplevel_data_navigation.html
    file_block_toplevel_data_navigation2.html
    file_block_toplevel_data_navigation3.html
+   file_block_toplevel_data_redirect.sjs
    file_same_site_cookies_subrequest.sjs
 +  file_same_site_cookies_toplevel_nav.sjs
  
@@ -116,6 +116,12 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
  [test_block_script_wrong_mime.html]
  [test_block_toplevel_data_navigation.html]
  skip-if = toolkit == 'android' # intermittent failure
+ [test_block_toplevel_data_img_navigation.html]
+ skip-if = toolkit == 'android' # intermittent failure
+ [test_allow_opening_data_pdf.html]
+ skip-if = toolkit == 'android'
+ [test_allow_opening_data_json.html]
+ skip-if = toolkit == 'android'
  [test_same_site_cookies_subrequest.html]
 +[test_same_site_cookies_toplevel_nav.html]
 diff --git a/dom/security/test/general/test_same_site_cookies_toplevel_nav.html b/dom/security/test/general/test_same_site_cookies_toplevel_nav.html

frg/work-js/mozilla-release/patches/1305777-2-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1506469156 18000
 # Node ID 71faac859b4a663c6b78b8064bd22b3dbe9ef64e
-# Parent  ed23199abc9971e41b9633a2e9c3a8cab8aa9f0c
+# Parent  2e4654387042d0e9246ff8aa285ece63781aeba7
 Bug 1305777 - Remove RDM manager switch and pref. r=ochameau
 
 This removes the switching based on the RDM.html pref and the pref itself.
@@ -31,7 +31,7 @@ diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
  const {MultiLocalizationHelper} = require("devtools/shared/l10n");
  const L10N = new MultiLocalizationHelper(
    "devtools/client/locales/startup.properties",
-   "devtools/startup/locales/key-shortcuts.properties"
+   "devtools/shim/locales/key-shortcuts.properties"
  );
  
 diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
@@ -81,7 +81,7 @@ diff --git a/devtools/client/menus.js b/devtools/client/menus.js
 diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
 --- a/devtools/client/preferences/devtools.js
 +++ b/devtools/client/preferences/devtools.js
-@@ -336,11 +336,8 @@ pref("devtools.editor.autoclosebrackets"
+@@ -330,11 +330,8 @@ pref("devtools.editor.autoclosebrackets"
  pref("devtools.editor.detectindentation", true);
  pref("devtools.editor.enableCodeFolding", true);
  pref("devtools.editor.autocomplete", true);
@@ -264,14 +264,14 @@ diff --git a/devtools/client/shared/test/browser_telemetry_button_responsive.js
 diff --git a/devtools/client/styleeditor/StyleEditorUI.jsm b/devtools/client/styleeditor/StyleEditorUI.jsm
 --- a/devtools/client/styleeditor/StyleEditorUI.jsm
 +++ b/devtools/client/styleeditor/StyleEditorUI.jsm
-@@ -24,17 +24,17 @@ const {SplitView} = require("resource://
+@@ -23,17 +23,17 @@ const {
+ const {SplitView} = require("resource://devtools/client/shared/SplitView.jsm");
  const {StyleSheetEditor} = require("resource://devtools/client/styleeditor/StyleSheetEditor.jsm");
  const {PluralForm} = require("devtools/shared/plural-form");
  const {PrefObserver} = require("devtools/client/shared/prefs");
  const csscoverage = require("devtools/shared/fronts/csscoverage");
  const {console} = require("resource://gre/modules/Console.jsm");
  const {KeyCodes} = require("devtools/client/shared/keycodes");
- const {OriginalSource} = require("devtools/client/styleeditor/original-source");
  
 -loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsivedesign/responsivedesign");
 +loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsive.html/manager", true);

frg/work-js/mozilla-release/patches/1305777-4-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1506469794 18000
 # Node ID d939f110bf2ebed1243c8b7ca540957b6b72b109
-# Parent  c9a9747b15c1b8b5758ac5b1c166466c7d83dd4a
+# Parent  6412d90b80abeec5fd7ec527f2936409b07f1f30
 Bug 1305777 - Remove old RDM. r=ochameau
 
 MozReview-Commit-ID: gOvvF9bcDT
@@ -10,7 +10,7 @@ MozReview-Commit-ID: gOvvF9bcDT
 diff --git a/.eslintignore b/.eslintignore
 --- a/.eslintignore
 +++ b/.eslintignore
-@@ -108,17 +108,16 @@ devtools/client/framework/**
+@@ -109,17 +109,16 @@ devtools/client/framework/**
  !devtools/client/framework/target*
  !devtools/client/framework/toolbox*
  devtools/client/inspector/markup/test/doc_markup_events_*.html
@@ -74,7 +74,7 @@ diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -179,29 +179,16 @@ devtools.jar:
+@@ -181,29 +181,16 @@ devtools.jar:
      skin/images/play.svg (themes/images/play.svg)
      skin/images/rewind.svg (themes/images/rewind.svg)
      skin/images/debugger-step-in.svg (themes/images/debugger-step-in.svg)
@@ -212,7 +212,7 @@ diff --git a/devtools/client/moz.build b/devtools/client/moz.build
 diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
 --- a/devtools/client/preferences/devtools.js
 +++ b/devtools/client/preferences/devtools.js
-@@ -96,19 +96,16 @@ pref("devtools.eyedropper.zoom", 6);
+@@ -93,19 +93,16 @@ pref("devtools.eyedropper.zoom", 6);
  pref("devtools.markup.collapseAttributes", true);
  
  // Length to collapse attributes
@@ -1594,7 +1594,7 @@ deleted file mode 100644
 -  head.js
 -  touch.html
 -  !/devtools/client/commandline/test/helpers.js
--  !/devtools/client/shared/test/shared-head.js
+-  !/devtools/client/framework/test/shared-head.js
 -
 -[browser_responsive_cmd.js]
 -[browser_responsivecomputedview.js]

frg/work-js/mozilla-release/patches/1305777-5-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1506470054 18000
 # Node ID a2c2643cf90939a10c637799cdc31f4e104dd4d6
-# Parent  33627fe235a6713d292e93201b2472782188d444
+# Parent  6cffe14d716964e32fe56c69f5299b434218ed3c
 Bug 1305777 - Clean up tests that supported both RDMs. r=ochameau
 
 MozReview-Commit-ID: 4coCvC4KHtn
@@ -10,15 +10,15 @@ MozReview-Commit-ID: 4coCvC4KHtn
 diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/test/browser.ini
 --- a/devtools/client/shared/test/browser.ini
 +++ b/devtools/client/shared/test/browser.ini
-@@ -32,16 +32,17 @@ support-files =
+@@ -30,16 +30,17 @@ support-files =
+   head.js
    helper_color_data.js
    helper_html_tooltip.js
    helper_inplace_editor.js
    leakhunt.js
-   shared-head.js
-   shared-redux-head.js
    test-actor-registry.js
    test-actor.js
+   !/devtools/client/framework/test/shared-head.js
 +  !/devtools/client/responsive.html/test/browser/devices.json
  
  [browser_css_angle.js]
@@ -28,7 +28,7 @@ diff --git a/devtools/client/shared/test/browser.ini b/devtools/client/shared/te
  [browser_cubic-bezier-03.js]
  [browser_cubic-bezier-04.js]
  [browser_cubic-bezier-05.js]
-@@ -167,17 +168,17 @@ skip-if = e10s # Test intermittently fai
+@@ -165,17 +166,17 @@ skip-if = e10s # Test intermittently fai
  [browser_theme.js]
  [browser_tableWidget_basic.js]
  [browser_tableWidget_keyboard_interaction.js]
@@ -90,7 +90,7 @@ diff --git a/devtools/client/shared/test/browser_telemetry_button_responsive.js
 diff --git a/devtools/client/styleeditor/test/browser.ini b/devtools/client/styleeditor/test/browser.ini
 --- a/devtools/client/styleeditor/test/browser.ini
 +++ b/devtools/client/styleeditor/test/browser.ini
-@@ -83,17 +83,17 @@ support-files =
+@@ -81,17 +81,17 @@ support-files =
  [browser_styleeditor_import.js]
  [browser_styleeditor_import_rule.js]
  [browser_styleeditor_init.js]

frg/work-js/mozilla-release/patches/1305777-6-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1506549203 18000
 # Node ID e2ea4cf82cae3e761e94af85e32b2f8a9a2c48dd
-# Parent  d96ab7c03ac0023596f302a3ac2142e433ecc35a
+# Parent  280ce67d4d802eccc327ce143d2083d481c70f96
 Bug 1305777 - Clean up touch simulator after old RDM removal. r=ochameau
 
 Only `simulator-core` is used by new RDM via the Emulation actor, so I've moved
@@ -158,13 +158,13 @@ diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
  DIRS += [
 +    'emulation',
      'highlighters',
-     'inspector',
      'utils',
      'webconsole',
  ]
  
  DevToolsModules(
      'accessibility.js',
+     'actor-registry.js',
 diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build
 --- a/devtools/shared/moz.build
 +++ b/devtools/shared/moz.build

frg/work-js/mozilla-release/patches/1305777-7-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1506616135 18000
 # Node ID 3b5b98033433fcba6a8d2a31dd4331bd01dff4e5
-# Parent  d4974edbf20b53fcd2085a582bf1e944076d7917
+# Parent  ea670d7c936e1546dde0d53998b22fc48f8e7242
 Bug 1305777 - Fix ESLint issues for moved files. r=jdescottes
 
 MozReview-Commit-ID: 6PVoLP4MFir
@@ -218,7 +218,7 @@ diff --git a/devtools/client/responsive.html/commands.js b/devtools/client/respo
      runAt: "client",
      name: "resize toggle",
      buttonId: "command-button-responsive",
-     buttonClass: "command-button",
+     buttonClass: "command-button command-button-invertable",
 -    tooltipText: l10n.lookupFormat("resizeModeToggleTooltip2",
 -                                   [(osString == "Darwin" ? "Cmd+Opt+M" : "Ctrl+Shift+M")]),
 +    tooltipText: l10n.lookupFormat(

frg/work-js/mozilla-release/patches/1342070-4-61a1.patch

@@ -3,7 +3,7 @@
 # Date 1523969997 -7200
 #      Tue Apr 17 14:59:57 2018 +0200
 # Node ID 7674892ac2302b03c75cae1174bff06bffe280ea
-# Parent  b9d1efa725b07c4b4a4f244deb92c080be46552c
+# Parent  1895728c417259f27016f7e3c472dbb2b824a621
 Bug 1342070 - Part 4: Remove unnecessary PromiseTestUtils.expectUncaughtRejection call. r=ochameau
 
 diff --git a/devtools/client/inspector/markup/test/browser_markup_links_06.js b/devtools/client/inspector/markup/test/browser_markup_links_06.js
@@ -25,9 +25,9 @@ diff --git a/devtools/client/inspector/markup/test/browser_markup_links_06.js b/
 -
  const TEST_URL = URL_ROOT + "doc_markup_links.html";
  
- add_task(function* () {
-   let {toolbox, inspector} = yield openInspectorForURL(TEST_URL);
+ add_task(async function() {
+   let {toolbox, inspector} = await openInspectorForURL(TEST_URL);
  
    info("Select a node with a cssresource attribute");
-   yield selectNode("link", inspector);
+   await selectNode("link", inspector);
  

frg/work-js/mozilla-release/patches/1344350-2no3-61a1.patch

@@ -343,7 +343,7 @@ diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftes
 +++ b/layout/reftests/mathml/reftest.list
 @@ -369,17 +369,17 @@ fuzzy-if(OSX,1,100) fuzzy-if(skiaContent
  == mfrac-E-1.html mfrac-E-1-ref.html
- test-pref(dom.webcomponents.enabled,true) == shadow-dom-1.html shadow-dom-1-ref.html
+ test-pref(dom.webcomponents.shadowdom.enabled,true) == shadow-dom-1.html shadow-dom-1-ref.html
  pref(dom.meta-viewport.enabled,true) pref(font.size.inflation.emPerLine,25) == font-inflation-1.html font-inflation-1-ref.html
  test-pref(font.minimum-size.x-math,40) == default-font.html default-font-ref.html
  != radicalbar-1.html about:blank

frg/work-js/mozilla-release/patches/1348960-58a1.patch

@@ -2,7 +2,7 @@
 # User J. Ryan Stinnett <jryans@gmail.com>
 # Date 1507095247 25200
 # Node ID 891602480e23b5ab1ae61458d3b7111ba8c3928f
-# Parent  14cb9bdb3fd7d1bd73e229262d74a80cc7c4c737
+# Parent  accbe687c6310be566d085b07723c8d7e9e41981
 Bug 1348960 - Expose openLinkIn for RDM tabs. r=ochameau
 
 MozReview-Commit-ID: 2EzZfBsNIrf
@@ -39,9 +39,9 @@ diff --git a/devtools/client/responsive.html/test/browser/browser.ini b/devtools
 @@ -12,16 +12,17 @@ support-files =
    touch.html
    !/devtools/client/commandline/test/helpers.js
+   !/devtools/client/framework/test/shared-head.js
+   !/devtools/client/framework/test/shared-redux-head.js
    !/devtools/client/inspector/test/shared-head.js
-   !/devtools/client/shared/test/shared-head.js
-   !/devtools/client/shared/test/shared-redux-head.js
    !/devtools/client/shared/test/test-actor.js
    !/devtools/client/shared/test/test-actor-registry.js
  

frg/work-js/mozilla-release/patches/1363061-60a1.patch

@@ -2,7 +2,7 @@
 # User Paolo Amadini <paolo.mozmail@amadzone.org>
 # Date 1520358059 0
 # Node ID af5fa4cbcf26422e4bb0693920c13db600b0ae84
-# Parent  5712d080cd7aeb8e0d56936f44432e5ff3bb2dbc
+# Parent  a1667c664d9a6b350935cb70d4c142216c047fd3
 Bug 1363061 - Rename toolkit/components/jsdownloads to toolkit/components/downloads. r=mak
 
 MozReview-Commit-ID: GuWeax0ubv3
@@ -50,32 +50,28 @@ diff --git a/build/dumbmake-dependencies b/build/dumbmake-dependencies
    toolkit/mozapps/extensions
    toolkit/profile
    toolkit/themes
-diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later b/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later
-new file mode 100644
---- /dev/null
-+++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later
-@@ -0,0 +1,21 @@
-+--- mochitest-browser-chrome.runtimes.json
-++++ mochitest-browser-chrome.runtimes.json
-+@@ -800,17 +800,17 @@
-+     "security/manager/ssl/tests/mochitest/browser/browser_certViewer.js": 3220,
-+     "security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js": 2066,
-+     "services/fxaccounts/tests/browser/browser_device_connected.js": 3094,
-+     "services/fxaccounts/tests/browser/browser_verify_login.js": 1763,
-+     "toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js": 6246,
-+     "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823,
-+     "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922,
-+     "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948,
-+-    "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102,
-++    "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102,
-+     "toolkit/components/narrate/test/browser_narrate.js": 2700,
-+     "toolkit/components/narrate/test/browser_voiceselect.js": 2254,
-+     "toolkit/components/narrate/test/browser_word_highlight.js": 2215,
-+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger.js": 15909,
-+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_httpsUpgrade.js": 3296,
-+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js": 4673,
-+     "toolkit/components/passwordmgr/test/browser/browser_context_menu.js": 12686,
-+     "toolkit/components/passwordmgr/test/browser/browser_context_menu_autocomplete_interaction.js": 3297,
+diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/runtimes/mochitest-browser-chrome.runtimes.json
+--- a/testing/runtimes/mochitest-browser-chrome.runtimes.json
++++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json
+@@ -766,17 +766,17 @@
+     "security/manager/ssl/tests/mochitest/browser/browser_certViewer.js": 3220, 
+     "security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js": 2066, 
+     "services/fxaccounts/tests/browser/browser_device_connected.js": 3094, 
+     "services/fxaccounts/tests/browser/browser_verify_login.js": 1763, 
+     "toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js": 6246, 
+     "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823, 
+     "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922, 
+     "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948, 
+-    "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102, 
++    "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102,
+     "toolkit/components/narrate/test/browser_narrate.js": 2700, 
+     "toolkit/components/narrate/test/browser_voiceselect.js": 2254, 
+     "toolkit/components/narrate/test/browser_word_highlight.js": 2215, 
+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger.js": 15909, 
+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_httpsUpgrade.js": 3296, 
+     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js": 4673, 
+     "toolkit/components/passwordmgr/test/browser/browser_context_menu.js": 12686, 
+     "toolkit/components/passwordmgr/test/browser/browser_context_menu_autocomplete_interaction.js": 3297, 
 diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build
 --- a/toolkit/components/build/moz.build
 +++ b/toolkit/components/build/moz.build

frg/work-js/mozilla-release/patches/1366531-58a1.patch

@@ -2,7 +2,7 @@
 # User Oriol Brufau <oriol-bugzilla@hotmail.com>
 # Date 1510182464 -3600
 # Node ID 4c25a8edd5db8f8f2bfbbe51f1050ef48d495659
-# Parent  a078b8fc74cefd299864d8abc2b58c9c05c9663e
+# Parent  fb4bee14d10b694c991b21a638bb5956388d32a3
 Bug 1366531 - convert uses of defer to 'new Promise' in client/jsonview r=nchevobbe
 
 MozReview-Commit-ID: InGMTAQ0X2R
@@ -29,10 +29,10 @@ diff --git a/devtools/client/jsonview/test/head.js b/devtools/client/jsonview/te
 +  let tab = await addTab(url);
 +  let browser = tab.linkedBrowser;
  
--    // Load devtools/shared/test/frame-script-utils.js
--    loadFrameScriptUtils();
-+  // Load devtools/shared/test/frame-script-utils.js
-+  loadFrameScriptUtils();
+-    // Load devtools/shared/frame-script-utils.js
+-    getFrameScript();
++  // Load devtools/shared/frame-script-utils.js
++  getFrameScript();
  
 -    // Load frame script with helpers for JSON View tests.
 -    let rootDir = getRootDirectory(gTestPath);

frg/work-js/mozilla-release/patches/1373558-60a1.patch

@@ -2,14 +2,14 @@
 # User Geoff Brown <gbrown@mozilla.com>
 # Date 1518115734 25200
 # Node ID c7247364971402614b17aa01f1ff867e4ef32a1c
-# Parent  e6f2659da25a7ae3d26da072ca6e72dc021163ed
+# Parent  ee107493f1847c003381a29a2457d32b2fae9b6a
 Bug 1373558 - disable browser_net_statistics-01.js for intermittent failures r=gbrown
 
 diff --git a/devtools/client/netmonitor/test/browser.ini b/devtools/client/netmonitor/test/browser.ini
 --- a/devtools/client/netmonitor/test/browser.ini
 +++ b/devtools/client/netmonitor/test/browser.ini
-@@ -170,16 +170,17 @@ skip-if = os == 'win' # bug 1391264
- [browser_net_set-cookie-same-site.js]
+@@ -166,16 +166,17 @@ skip-if = os == 'win' # bug 1391264
+ [browser_net_send-beacon-other-tab.js]
  [browser_net_simple-request-data.js]
  [browser_net_simple-request-details.js]
  skip-if = true # Bug 1258809

frg/work-js/mozilla-release/patches/1382602-61a1.patch

@@ -2,7 +2,7 @@
 # User yulia <ystartsev@mozilla.com>
 # Date 1521035904 -3600
 # Node ID e059b4fc0521a26584652b65726a92e3df009e73
-# Parent  981719292f44a287eb9fc3410706d16825fa2ee9
+# Parent  69c569fdaf08bf9f5f7d7d8583c664c1b437e347
 Bug 1382602 - update devtools/client/netmonitor to use new event emitter. r=Honza,nchevobbe
 
 MozReview-Commit-ID: 6cEqHUGaMlM
@@ -104,7 +104,7 @@ diff --git a/devtools/client/netmonitor/test/browser_net_pause.js b/devtools/cli
 diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
 --- a/devtools/client/netmonitor/test/head.js
 +++ b/devtools/client/netmonitor/test/head.js
-@@ -141,17 +141,17 @@ function toggleCache(target, disabled) {
+@@ -140,17 +140,17 @@ function toggleCache(target, disabled) {
  
  /**
   * Wait for 2 markers during document load.
@@ -123,7 +123,7 @@ diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonito
          resolve(markers);
        }
      }
-@@ -180,24 +180,24 @@ function waitForAllRequestsFinished(moni
+@@ -179,24 +179,24 @@ function waitForAllRequestsFinished(moni
    let window = monitor.panelWin;
    let { connector } = window;
    let { getNetworkRequest } = connector;
@@ -150,7 +150,7 @@ diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonito
      }
  
      function maybeResolve() {
-@@ -238,23 +238,23 @@ let updatedTypes = [
+@@ -237,23 +237,23 @@ let updatedTypes = [
    "NetMonitor:NetworkEventUpdated:ResponseContent",
    "NetMonitor:NetworkEventUpdated:SecurityInfo",
    "NetMonitor:NetworkEventUpdated:EventTimings",
@@ -178,7 +178,7 @@ diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonito
    function checkNetworkEventUpdateState() {
      for (let key in finishedQueue) {
        if (finishedQueue[key] > 0) {
-@@ -349,36 +349,36 @@ function teardown(monitor) {
+@@ -348,36 +348,36 @@ function teardown(monitor) {
  
  function waitForNetworkEvents(monitor, getRequests) {
    return new Promise((resolve) => {
@@ -240,4 +240,4 @@ diff --git a/devtools/client/netmonitor/webpack.config.js b/devtools/client/netm
        // Locales need to be explicitly mapped to the en-US subfolder
        "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
        "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
-       "devtools/startup/locales": path.join(__dirname, "../../shared/locales/en-US"),
+       "devtools/shim/locales": path.join(__dirname, "../../shared/locales/en-US"),

frg/work-js/mozilla-release/patches/1387827-58a1.patch

@@ -2,7 +2,7 @@
 # User Joel Maher <jmaher@mozilla.com>
 # Date 1508168543 14400
 # Node ID f7bf0e6554570b40e6ce701f1f3f3ef0941fa802
-# Parent  9747bb368b54187196fc58dc8df9b9aa451149e4
+# Parent  339afbc7080c4983a1e53ea33391e8b980870f05
 Bug 1387827 - Disable 2 devtools tests on coverage builds for frequent timeouts. r=gbrown, a=test-only
 
 diff --git a/devtools/client/aboutdebugging/test/browser.ini b/devtools/client/aboutdebugging/test/browser.ini
@@ -14,7 +14,7 @@ diff --git a/devtools/client/aboutdebugging/test/browser.ini b/devtools/client/a
    service-workers/fetch-sw.js
    service-workers/push-sw.html
    service-workers/push-sw.js
-   !/devtools/client/shared/test/shared-head.js
+   !/devtools/client/framework/test/shared-head.js
  
  [browser_addons_debug_bootstrapped.js]
 +skip-if = coverage # Bug 1387827
@@ -38,13 +38,13 @@ diff --git a/devtools/client/aboutdebugging/test/browser.ini b/devtools/client/a
 diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
 --- a/devtools/client/framework/test/browser.ini
 +++ b/devtools/client/framework/test/browser.ini
-@@ -44,16 +44,17 @@ support-files =
+@@ -43,16 +43,17 @@ support-files =
+   browser_toolbox_options_enable_serviceworkers_testing.html
+   serviceworker.js
+   sjs_code_reload.sjs
    sjs_code_bundle_reload_map.sjs
    test_browser_toolbox_debugger.js
    !/devtools/client/debugger/new/test/mochitest/head.js
-   !/devtools/client/shared/test/frame-script-utils.js
-   !/devtools/client/shared/test/shared-head.js
-   !/devtools/client/shared/test/shared-redux-head.js
  
  [browser_browser_toolbox.js]
 +skip-if = coverage # Bug 1387827

frg/work-js/mozilla-release/patches/1389251-1-62a1.patch

@@ -3,7 +3,7 @@
 # Date 1529327184 -7200
 #      Mon Jun 18 15:06:24 2018 +0200
 # Node ID 0c2c45a2a22d9ce58df619212a35d985751b2ab3
-# Parent  b148f594f8556848865ce11560bb8f6e4e4edfb9
+# Parent  73ff16f306a7b74915a817a8cf5e70e25de2d49a
 Bug 1389251 - Do not escape spaces in nsSimpleURI r=bz
 
 This change makes nsEscape::T_EscapeURL not escape spaces when passed esc_OnlyNonASCII.
@@ -41,7 +41,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
  
    const FORM_DATA = {
      children: [{
-       xpath: {"/xhtml:html/xhtml:body/xhtml:input": "M"},
+       xpath: {"/xhtml:html/xhtml:body/xhtml:input": "m"},
 -      url: "data:text/html;charset=utf-8,<input%20autofocus=true>"
 +      url: "data:text/html;charset=utf-8,<input autofocus=true>"
      }]
@@ -55,7 +55,7 @@ diff --git a/browser/components/sessionstore/test/browser_formdata.js b/browser/
 diff --git a/dom/url/tests/test_url.html b/dom/url/tests/test_url.html
 --- a/dom/url/tests/test_url.html
 +++ b/dom/url/tests/test_url.html
-@@ -443,17 +443,17 @@
+@@ -474,17 +474,17 @@
      url.hash = "newhash";
      is(url.href, "scheme:path?query#newhash");
      url.search = "";
@@ -122,7 +122,7 @@ diff --git a/netwerk/test/unit/test_URIs.js b/netwerk/test/unit/test_URIs.js
 diff --git a/xpcom/io/nsEscape.cpp b/xpcom/io/nsEscape.cpp
 --- a/xpcom/io/nsEscape.cpp
 +++ b/xpcom/io/nsEscape.cpp
-@@ -344,21 +344,20 @@ T_EscapeURL(const typename T::char_type*
+@@ -348,21 +348,20 @@ T_EscapeURL(const typename T::char_type*
      // And, we will not escape non-ascii characters if requested.
      // On special request we will also escape the colon even when
      // not covered by the matrix.

frg/work-js/mozilla-release/patches/1393900-57a1.patch

@@ -2,7 +2,7 @@
 # User Andrew Halberstadt <ahalberstadt@mozilla.com>
 # Date 1503687918 14400
 # Node ID d87bd54dc409c481e1c28a16be50e76ea91cf6c3
-# Parent  53097dcb6b5a52b01423e8699dff3dc13b338c0f
+# Parent  0702078d268242bd4252a711f6d93d147e606bd5
 Bug 1393900 - Update mochitest runtimes files to balance the chunks, r=jmaher
 
 MozReview-Commit-ID: FWsc3rBv7cL
@@ -3267,7 +3267,7 @@ diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/r
 +    "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823, 
 +    "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922, 
 +    "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948, 
-+    "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102, 
++    "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102, 
 +    "toolkit/components/narrate/test/browser_narrate.js": 2700, 
 +    "toolkit/components/narrate/test/browser_voiceselect.js": 2254, 
 +    "toolkit/components/narrate/test/browser_word_highlight.js": 2215, 
@@ -3638,32 +3638,6 @@ diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/r
 +    "uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js": 2437
    }
  }
-diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later b/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later
-deleted file mode 100644
---- a/testing/runtimes/mochitest-browser-chrome.runtimes.json.1363061.later
-+++ /dev/null
-@@ -1,21 +0,0 @@
----- mochitest-browser-chrome.runtimes.json
--+++ mochitest-browser-chrome.runtimes.json
--@@ -800,17 +800,17 @@
--     "security/manager/ssl/tests/mochitest/browser/browser_certViewer.js": 3220,
--     "security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js": 2066,
--     "services/fxaccounts/tests/browser/browser_device_connected.js": 3094,
--     "services/fxaccounts/tests/browser/browser_verify_login.js": 1763,
--     "toolkit/components/aboutperformance/tests/browser/browser_aboutperformance.js": 6246,
--     "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823,
--     "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922,
--     "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948,
---    "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102,
--+    "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102,
--     "toolkit/components/narrate/test/browser_narrate.js": 2700,
--     "toolkit/components/narrate/test/browser_voiceselect.js": 2254,
--     "toolkit/components/narrate/test/browser_word_highlight.js": 2215,
--     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger.js": 15909,
--     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_httpsUpgrade.js": 3296,
--     "toolkit/components/passwordmgr/test/browser/browser_capture_doorhanger_window_open.js": 4673,
--     "toolkit/components/passwordmgr/test/browser/browser_context_menu.js": 12686,
--     "toolkit/components/passwordmgr/test/browser/browser_context_menu_autocomplete_interaction.js": 3297,
 diff --git a/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
 --- a/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
 +++ b/testing/runtimes/mochitest-devtools-chrome-e10s.runtimes.json
@@ -8669,14 +8643,9 @@ diff --git a/testing/runtimes/mochitest-media.runtimes.json b/testing/runtimes/m
  }
 \ No newline at end of file
 diff --git a/testing/runtimes/writeruntimes.py b/testing/runtimes/writeruntimes.py
-old mode 100644
-new mode 100755
 --- a/testing/runtimes/writeruntimes.py
 +++ b/testing/runtimes/writeruntimes.py
-@@ -1,11 +1,12 @@
- 
- from __future__ import absolute_import, print_function
- 
+@@ -1,8 +1,9 @@
 +#!/usr/bin/env python
  from argparse import ArgumentParser
  from collections import defaultdict

frg/work-js/mozilla-release/patches/1394554-2-57a1.patch

@@ -2,7 +2,7 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1504683278 -7200
 # Node ID 5fb3040f8887f30b7f86c7d0afe474282c6abaa2
-# Parent  8a0090c8ae0aad275dfca6a9809fa026f5abdd48
+# Parent  8e0069d74a194e5c9a19595762cce8076b0a2607
 Bug 1394554: Test block data: URI toplevel navigations after redirect. r=smaug
 
 diff --git a/dom/security/test/general/file_block_toplevel_data_redirect.sjs b/dom/security/test/general/file_block_toplevel_data_redirect.sjs
@@ -27,7 +27,7 @@ new file mode 100644
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -1,16 +1,17 @@
+@@ -1,14 +1,15 @@
  [DEFAULT]
  support-files =
    file_contentpolicytype_targeted_link_iframe.sjs
@@ -37,14 +37,12 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
    file_block_toplevel_data_navigation2.html
    file_block_toplevel_data_navigation3.html
 +  file_block_toplevel_data_redirect.sjs
-   file_same_site_cookies_subrequest.sjs
-   file_same_site_cookies_toplevel_nav.sjs
-   file_same_site_cookies_cross_origin_context.sjs
-   file_same_site_cookies_from_script.sjs
-   file_same_site_cookies_redirect.sjs
-   file_same_site_cookies_toplevel_set_cookie.sjs
-   file_same_site_cookies_blob_iframe_navigation.html
-   file_same_site_cookies_blob_iframe_inclusion.html
+ 
+ [test_contentpolicytype_targeted_link_iframe.html]
+ [test_nosniff.html]
+ [test_block_script_wrong_mime.html]
+ [test_block_toplevel_data_navigation.html]
+ skip-if = toolkit == 'android' # intermittent failure
 diff --git a/dom/security/test/general/test_block_toplevel_data_navigation.html b/dom/security/test/general/test_block_toplevel_data_navigation.html
 --- a/dom/security/test/general/test_block_toplevel_data_navigation.html
 +++ b/dom/security/test/general/test_block_toplevel_data_navigation.html

frg/work-js/mozilla-release/patches/1396798-2-57a1.patch

@@ -2,15 +2,15 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1504707378 -7200
 # Node ID 79bf8a92a0ea07b5a6a3c167a5586afc6dab30b4
-# Parent  d6deaf1c4986ca61664a140833b393b85e889276
+# Parent  87e93cff96f5e9400d38180d10e88d75da20293f
 Bug 1396798: Test toplevel data: URI navigation to images. r=smaug
 
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -21,16 +21,18 @@ support-files =
-   file_same_site_cookies_about_inclusion.html
-   file_same_site_cookies_about.sjs
+@@ -8,8 +8,10 @@ support-files =
+   file_block_toplevel_data_navigation3.html
+   file_block_toplevel_data_redirect.sjs
  
  [test_contentpolicytype_targeted_link_iframe.html]
  [test_nosniff.html]
@@ -19,14 +19,6 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
  skip-if = toolkit == 'android' # intermittent failure
 +[test_block_toplevel_data_img_navigation.html]
 +skip-if = toolkit == 'android' # intermittent failure
- [test_same_site_cookies_subrequest.html]
- [test_same_site_cookies_toplevel_nav.html]
- [test_same_site_cookies_cross_origin_context.html]
- [test_same_site_cookies_from_script.html]
- [test_same_site_cookies_redirect.html]
- [test_same_site_cookies_toplevel_set_cookie.html]
- [test_same_site_cookies_iframe.html]
- [test_same_site_cookies_about.html]
 diff --git a/dom/security/test/general/test_block_toplevel_data_img_navigation.html b/dom/security/test/general/test_block_toplevel_data_img_navigation.html
 new file mode 100644
 --- /dev/null

frg/work-js/mozilla-release/patches/1397795-2-61a1.patch

@@ -3,7 +3,7 @@
 # Date 1519046086 0
 #      Mon Feb 19 13:14:46 2018 +0000
 # Node ID c8618ca631bf0f0c3ad967465d3551b8fad5909c
-# Parent  3b95a0a2c7bbbdf3fcd65977ca67deb69f0b3eb7
+# Parent  e7ba13fb2c6e99eb90ed8ac4ca7fc64700fb19ec
 Bug 1397795 part 2 - Crashtest for box-shadow. r=mstange
 
 MozReview-Commit-ID: 8zEK1R77znx
@@ -54,7 +54,7 @@ diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtest
  load 1403377.html
  load 1405771.html
  load 1406109-1.html
- pref(dom.webcomponents.enabled,true) load 1324463.html
+ pref(dom.webcomponents.shadowdom.enabled,true) load 1324463.html
  pref(dom.webcomponents.customelements.enabled,true) load 1413815.html
  load 1411473.html
- pref(dom.webcomponents.enabled,false) load 1422931.html
+ pref(dom.webcomponents.shadowdom.enabled,false) load 1422931.html

frg/work-js/mozilla-release/patches/1397795-3-61a1.patch

@@ -85,10 +85,10 @@ diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtest
  load 942979.html
  load 973401.html
  load 978646.html
- pref(dom.webcomponents.enabled,true) load 1024428-1.html
+ pref(dom.webcomponents.shadowdom.enabled,true) load 1024428-1.html
 -load 1026714.html
- pref(dom.webcomponents.enabled,true) load 1027461-1.html
- pref(dom.webcomponents.enabled,true) load 1029710.html
+ pref(dom.webcomponents.shadowdom.enabled,true) load 1027461-1.html
+ pref(dom.webcomponents.shadowdom.enabled,true) load 1029710.html
  load 1154598.xhtml
  load 1157995.html
  load 1158412.html

frg/work-js/mozilla-release/patches/1398692-2-57a1.patch

@@ -2,13 +2,13 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1505367427 -7200
 # Node ID 54e49813d0c511e326826c1add34f53f8f72061d
-# Parent  21755ae660f44b75ffaac32d72ef07e496688c5a
+# Parent  e4c0c7dd6760c3eb8bf6ccbbb173e61ec5743cab
 Bug 1398692: Test toplevel navigation to a data:application/pdf. r=bz
 
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -23,16 +23,18 @@ support-files =
+@@ -10,8 +10,10 @@ support-files =
  
  [test_contentpolicytype_targeted_link_iframe.html]
  [test_nosniff.html]
@@ -19,14 +19,6 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
  skip-if = toolkit == 'android' # intermittent failure
 +[test_allow_opening_data_pdf.html]
 +skip-if = toolkit == 'android'
- [test_same_site_cookies_subrequest.html]
- [test_same_site_cookies_toplevel_nav.html]
- [test_same_site_cookies_cross_origin_context.html]
- [test_same_site_cookies_from_script.html]
- [test_same_site_cookies_redirect.html]
- [test_same_site_cookies_toplevel_set_cookie.html]
- [test_same_site_cookies_iframe.html]
- [test_same_site_cookies_about.html]
 diff --git a/dom/security/test/general/test_allow_opening_data_pdf.html b/dom/security/test/general/test_allow_opening_data_pdf.html
 new file mode 100644
 --- /dev/null

frg/work-js/mozilla-release/patches/1398722-58a1.patch

@@ -2,7 +2,7 @@
 # User abhinav <abhinav.koppula@gmail.com>
 # Date 1506283939 -19800
 # Node ID 12107922ed6df7dc0a681f0f088817dc58e59e83
-# Parent  474c8d94caca2cad1e449d699dbde9a8eefe75cf
+# Parent  15e809c0d8135d317ea17deb875c6705d8ac72c6
 Bug 1398722 - Fix to prevent 'Edit Position' button from disappearing after modifying offset of element. r=jdescottes
 
 MozReview-Commit-ID: H2n3TtIqagG
@@ -42,9 +42,9 @@ diff --git a/devtools/client/inspector/boxmodel/test/browser.ini b/devtools/clie
 --- a/devtools/client/inspector/boxmodel/test/browser.ini
 +++ b/devtools/client/inspector/boxmodel/test/browser.ini
 @@ -9,16 +9,17 @@ support-files =
+   !/devtools/client/framework/test/shared-head.js
    !/devtools/client/inspector/test/head.js
    !/devtools/client/inspector/test/shared-head.js
-   !/devtools/client/shared/test/shared-head.js
    !/devtools/client/shared/test/test-actor.js
    !/devtools/client/shared/test/test-actor-registry.js
  

frg/work-js/mozilla-release/patches/1398981-59a1.patch

@@ -2,7 +2,7 @@
 # User Jessica Jong <jjong@mozilla.com>
 # Date 1515140258 -28800
 # Node ID b647cd8f54368a02c67c14025d8e0a21ae01d18c
-# Parent  8f1d9214610e691d004e165ff08c01241361f60d
+# Parent  4701f1271ef90cc864dd6ba83319ff0f2acab2e2
 Bug 1398981 - Turn off webcomponents pref by default when running tests. r=smaug
 
 diff --git a/accessible/tests/mochitest/elm/a11y.ini b/accessible/tests/mochitest/elm/a11y.ini
@@ -1047,7 +1047,7 @@ diff --git a/dom/events/test/test_bug1264380.html b/dom/events/test/test_bug1264
 diff --git a/dom/tests/mochitest/general/test_interfaces.js b/dom/tests/mochitest/general/test_interfaces.js
 --- a/dom/tests/mochitest/general/test_interfaces.js
 +++ b/dom/tests/mochitest/general/test_interfaces.js
-@@ -498,17 +498,17 @@ var interfaceNamesInGlobalScope = [
+@@ -498,17 +498,17 @@ var interfaceNamesInGlobalScope =
      "HTMLProgressElement",
  // IMPORTANT: Do not change this list without review from a DOM peer!
      "HTMLQuoteElement",
@@ -1066,7 +1066,7 @@ diff --git a/dom/tests/mochitest/general/test_interfaces.js b/dom/tests/mochites
      "HTMLStyleElement",
  // IMPORTANT: Do not change this list without review from a DOM peer!
      "HTMLTableCaptionElement",
-@@ -822,17 +822,17 @@ var interfaceNamesInGlobalScope = [
+@@ -822,17 +822,17 @@ var interfaceNamesInGlobalScope =
      "ServiceWorkerContainer",
  // IMPORTANT: Do not change this list without review from a DOM peer!
      "ServiceWorkerRegistration",
@@ -2927,16 +2927,16 @@ diff --git a/dom/tests/mochitest/webcomponents/test_style_fallback_content.html
  </script>
  </body>
  </html>
-diff --git a/testing/profiles/common/user.js b/testing/profiles/common/user.js
---- a/testing/profiles/common/user.js
-+++ b/testing/profiles/common/user.js
-@@ -59,17 +59,17 @@ user_pref("app.update.enabled", false);
+diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
+--- a/testing/profiles/prefs_general.js
++++ b/testing/profiles/prefs_general.js
+@@ -60,17 +60,17 @@ user_pref("app.update.enabled", false);
  user_pref("app.update.staging.enabled", false);
  user_pref("app.update.url.android", "");
  // Make sure GMPInstallManager won't hit the network.
- user_pref("media.gmp-manager.url.override", "http://{server}/dummy-gmp-manager.xml");
+ user_pref("media.gmp-manager.url.override", "http://%(server)s/dummy-gmp-manager.xml");
  user_pref("media.gmp-manager.updateEnabled", false);
- user_pref("media.hls.server.url", "http://{server}/tests/dom/media/test/hls");
+ user_pref("media.hls.server.url", "http://%(server)s/tests/dom/media/test/hls");
  user_pref("dom.w3c_touch_events.enabled", 1);
  user_pref("layout.accessiblecaret.enabled_on_touch", false);
 -user_pref("dom.webcomponents.enabled", true);
@@ -2948,4 +2948,4 @@ diff --git a/testing/profiles/common/user.js b/testing/profiles/common/user.js
  // Disable the caret blinking so we get stable snapshot
  user_pref("ui.caretBlinkTime", -1);
  
- // Don't allow background tabs to be zombified, otherwise for tests that
+ // AddonManager tests require that the experiments provider be present.

frg/work-js/mozilla-release/patches/1399242-3-59a1.patch

@@ -2,7 +2,7 @@
 # User Alexandre Poirot <poirot.alex@gmail.com>
 # Date 1507572874 -7200
 # Node ID 3742c29706ebbdf72013b49f22ddc35d1e8c3c04
-# Parent  b6156b7824a801ea51bb73ecc2b6a1e5023e780c
+# Parent  e673ac7d68a85c5fbb8d14e8a9b7f13da2722279
 Bug 1399242 - Prevent console react updates while console isn't visible. r=nchevobbe
 
 MozReview-Commit-ID: A6NGLbiuyTE
@@ -199,12 +199,12 @@ diff --git a/devtools/client/webconsole/new-console-output/new-console-output-wr
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -472,11 +472,12 @@ skip-if = true #       Bug 1403200
+@@ -436,11 +436,12 @@ skip-if = true #       Bug 1403196
+ [browser_webconsole_variables_view_while_debugging.js]
+ skip-if = true #       Bug 1403200
  [browser_webconsole_variables_view_while_debugging_and_inspecting.js]
  skip-if = true #       Bug 1403205
  [browser_webconsole_view_source.js]
- skip-if = true #       Bug 1405652
- # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_violation.js]
  skip-if = true #       Bug 1405245
  # old console skip-if = e10s && (os == 'win') # Bug 1264955

frg/work-js/mozilla-release/patches/1399886-4-58a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1507144428 -7200
 # Node ID 534f2a0caa2c98d1eabb00e9a74352831bc2f2de
-# Parent  779015a4100098b8fba507c1e1c3ae7164866037
+# Parent  9647ca3e2e115152c8d485dee9d3442677298c2a
 Bug 1399886 - remove unnecessary invertable CSS classes on devtools icons;r=gl
 
 Using fill instead of filter we don't need to define each icon as
@@ -318,7 +318,7 @@ diff --git a/devtools/client/framework/components/toolbox-toolbar.js b/devtools/
 diff --git a/devtools/client/framework/devtools.js b/devtools/client/framework/devtools.js
 --- a/devtools/client/framework/devtools.js
 +++ b/devtools/client/framework/devtools.js
-@@ -95,20 +95,16 @@ DevTools.prototype = {
+@@ -96,20 +96,16 @@ DevTools.prototype = {
     *
     * Each toolDefinition has the following properties:
     * - id: Unique identifier for this tool (string|required)
@@ -389,12 +389,12 @@ diff --git a/devtools/client/inspector/inspector.xhtml b/devtools/client/inspect
        </div>
      </div>
  
-diff --git a/devtools/client/responsivedesign/resize-commands.js b/devtools/client/responsivedesign/resize-commands.js
---- a/devtools/client/responsivedesign/resize-commands.js
-+++ b/devtools/client/responsivedesign/resize-commands.js
+diff --git a/devtools/client/responsive.html/commands.js b/devtools/client/responsive.html/commands.js
+--- a/devtools/client/responsive.html/commands.js
++++ b/devtools/client/responsive.html/commands.js
 @@ -38,17 +38,17 @@ exports.items = [
      manual: l10n.lookupFormat("resizeModeManual2", [BRAND_SHORT_NAME]),
-     exec: gcli_cmd_resize
+     exec: resize
    },
    {
      item: "command",
@@ -403,14 +403,14 @@ diff --git a/devtools/client/responsivedesign/resize-commands.js b/devtools/clie
      buttonId: "command-button-responsive",
 -    buttonClass: "command-button command-button-invertable",
 +    buttonClass: "command-button",
-     tooltipText: l10n.lookupFormat("resizeModeToggleTooltip2",
-                                    [(osString == "Darwin" ? "Cmd+Opt+M" : "Ctrl+Shift+M")]),
+     tooltipText: l10n.lookupFormat(
+       "resizeModeToggleTooltip2",
+       [(osString == "Darwin" ? "Cmd+Opt+M" : "Ctrl+Shift+M")]
+     ),
      description: l10n.lookup("resizeModeToggleDesc"),
      manual: l10n.lookupFormat("resizeModeManual2", [BRAND_SHORT_NAME]),
      state: {
-       isChecked: function (aTarget) {
-         if (!aTarget.tab) {
-           return false;
+       isChecked: function (target) {
 diff --git a/devtools/client/scratchpad/scratchpad-commands.js b/devtools/client/scratchpad/scratchpad-commands.js
 --- a/devtools/client/scratchpad/scratchpad-commands.js
 +++ b/devtools/client/scratchpad/scratchpad-commands.js

frg/work-js/mozilla-release/patches/1399948-2-58a1.patch

@@ -2,7 +2,7 @@
 # User Darren Hobin <darrenhobin@live.com>
 # Date 1506265183 14400
 # Node ID b8c11514db364abd3e1ee099d55f1106e48e3bfc
-# Parent  d0edba63bb7f42be259a9a7212b6fa1c3d5417ed
+# Parent  6823d1eeab57794a9d25bf12f937a80e22d1247d
 Bug 1399948 - Part 2: Implement photon styles for breadcrumbs. r=bgrins
 
 MozReview-Commit-ID: IQX8uDsSapO
@@ -10,7 +10,7 @@ MozReview-Commit-ID: IQX8uDsSapO
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -106,16 +106,17 @@ devtools.jar:
+@@ -109,16 +109,17 @@ devtools.jar:
      skin/devtools-browser.css (themes/devtools-browser.css)
      skin/dark-theme.css (themes/dark-theme.css)
      skin/light-theme.css (themes/light-theme.css)
@@ -28,7 +28,7 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
      skin/images/controls.png (themes/images/controls.png)
      skin/images/controls@2x.png (themes/images/controls@2x.png)
      skin/images/animation-fast-track.svg (themes/images/animation-fast-track.svg)
-@@ -262,17 +263,16 @@ devtools.jar:
+@@ -267,17 +268,16 @@ devtools.jar:
      skin/images/firebug/twisty-open-firebug.svg (themes/images/firebug/twisty-open-firebug.svg)
      skin/images/firebug/arrow-down.svg (themes/images/firebug/arrow-down.svg)
      skin/images/firebug/arrow-up.svg (themes/images/firebug/arrow-up.svg)
@@ -86,7 +86,7 @@ diff --git a/devtools/client/themes/breadcrumbs.css b/devtools/client/themes/bre
 -  content: "";
 -  position: absolute;
 -  top: 1px;
--  inset-inline-start: 0;
+-  offset-inline-start: 0;
 -  width: 12px;
 -  height: 22px;
 -  background-repeat: no-repeat;

frg/work-js/mozilla-release/patches/1401548-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511968290 -3600
 # Node ID 897dda0b93d8e34d32bf607749414285cb912be9
-# Parent  93b864f872a2e41d9c22144b5f3950556dde380d
+# Parent  be75de14bbc7d1ede4889eb19473aa7f39cb5695
 Bug 1401548 - rename and enable browser_bug_869003_inspect_cross_domain_object.js;r=nchevobbe
 
 MozReview-Commit-ID: 6RnfOEsLQW1
@@ -10,7 +10,7 @@ MozReview-Commit-ID: 6RnfOEsLQW1
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -79,18 +79,16 @@ support-files =
+@@ -80,18 +80,16 @@ support-files =
    test-bug-766001-console-log.js
    test-bug-766001-js-console-links.html
    test-bug-766001-js-errors.js
@@ -25,11 +25,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-iframe-child.html
    test-iframe-parent.html
    test-certificate-messages.html
-   test-click-function-to-source.html
-   test-click-function-to-source.js
    test-closure-optimized-out.html
    test-closures.html
-@@ -128,16 +126,18 @@ support-files =
+   test-console-api-stackframe.html
+   test-console-clear.html
+@@ -127,16 +125,18 @@ support-files =
    test-filter.html
    test-for-of.html
    test-iframe-762593-insecure-form-action.html
@@ -48,7 +48,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-location-styleeditor-link-2.css
    test-location-styleeditor-link.html
    test-mixedcontent-securityerrors.html
-@@ -310,17 +310,16 @@ skip-if = true #       Bug 1404371
+@@ -314,17 +314,16 @@ skip-if = true #       Bug 1404371
  skip-if = true #       Bug 1405343
  [browser_webconsole_input_focus.js]
  [browser_webconsole_insecure_passwords_about_blank_web_console_warning.js]

frg/work-js/mozilla-release/patches/1401847-60a1.patch

@@ -2,7 +2,7 @@
 # User Erica Wright <ewright@mozilla.com>
 # Date 1518795609 18000
 # Node ID 6e462b0ef1692b12f6156be7877de8be0473a4c2
-# Parent  485104aa320872196290140eed9fb722ea9206b6
+# Parent  d9ca6d8963b91a5a8315545ee98c82eb1872c802
 Bug 1401847 - Custom layout grid colors should be restored per domain. r=jdescottes
 
 MozReview-Commit-ID: GYrZl3r7040
@@ -188,7 +188,7 @@ diff --git a/devtools/client/inspector/grids/grid-inspector.js b/devtools/client
 diff --git a/devtools/client/inspector/grids/test/browser.ini b/devtools/client/inspector/grids/test/browser.ini
 --- a/devtools/client/inspector/grids/test/browser.ini
 +++ b/devtools/client/inspector/grids/test/browser.ini
-@@ -28,9 +28,10 @@ support-files =
+@@ -28,10 +28,11 @@ support-files =
  [browser_grids_grid-list-toggle-single-grid.js]
  [browser_grids_grid-outline-cannot-show-outline.js]
  [browser_grids_grid-outline-highlight-area.js]
@@ -198,6 +198,7 @@ diff --git a/devtools/client/inspector/grids/test/browser.ini b/devtools/client/
  [browser_grids_grid-outline-writing-mode.js]
  [browser_grids_highlighter-setting-rules-grid-toggle.js]
 +[browser_grids_persist-color-palette.js]
+ [browser_grids_number-of-css-grids-telemetry.js]
  [browser_grids_restored-after-reload.js]
 diff --git a/devtools/client/inspector/grids/test/browser_grids_persist-color-palette.js b/devtools/client/inspector/grids/test/browser_grids_persist-color-palette.js
 new file mode 100644
@@ -256,7 +257,7 @@ diff --git a/devtools/client/inspector/grids/test/head.js b/devtools/client/insp
 --- a/devtools/client/inspector/grids/test/head.js
 +++ b/devtools/client/inspector/grids/test/head.js
 @@ -16,16 +16,17 @@ Services.scriptloader.loadSubScript(
-   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-redux-head.js",
+   "chrome://mochitests/content/browser/devtools/client/framework/test/shared-redux-head.js",
    this);
  
  Services.prefs.setIntPref("devtools.toolbox.footer.height", 350);

frg/work-js/mozilla-release/patches/1401942-2-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511970978 -3600
 # Node ID 97f3b9b875d71f0ad5c9fe395ca02eac52f7a3d3
-# Parent  6c566b16b4db58ec113ae090d27179a399b682e0
+# Parent  5eefb7ef6e5cccdd8ee9c0c0e462519165645302
 Bug 1401942 - Rename and enable browser_bug664688_sandbox_update_after_navigation.js;r=nchevobbe
 
 MozReview-Commit-ID: FbR1FoUp3qo
@@ -10,10 +10,10 @@ MozReview-Commit-ID: FbR1FoUp3qo
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -426,17 +426,16 @@ skip-if = true #       Bug 1404832
+@@ -382,17 +382,16 @@ skip-if = true #       Bug 1404832
+ [browser_webconsole_reflow.js]
  skip-if = true #       Bug 1406022
  [browser_webconsole_reopen_closed_tab.js]
- skip-if = true # Bug 1408947
  [browser_webconsole_repeat_different_objects.js]
  skip-if = true #       Bug 1401953
  [browser_webconsole_repeated_messages_accuracy.js]
@@ -27,7 +27,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_select_all.js]
  skip-if = true #       Bug 1404359
  [browser_webconsole_show_subresource_security_errors.js]
- skip-if = true # Bug 1408948
+ [browser_webconsole_shows_reqs_in_netmonitor.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js

frg/work-js/mozilla-release/patches/1401944-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1512463762 -3600
 # Node ID ea00ea69cb7e1b80a9cb31cf797efa891cbccc5f
-# Parent  40fa69b2a422464ee3c4c978cc856d0ae250b1f2
+# Parent  66902a4c904eb135a58bc93074aa32a2f91051d2
 Bug 1401944 - Delete browser_webconsole_copy_link_location in new console frontend; r=jdescottes.
 
 The test was already migrated. Took this as an opportunity to refactor the
@@ -13,13 +13,13 @@ MozReview-Commit-ID: CjbBelrWjS8
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -254,18 +254,16 @@ skip-if = (os == 'linux' && bits == 32 &
+@@ -254,18 +254,16 @@ subsuite = clipboard
+ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_link_location.js]
  subsuite = clipboard
  skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_object.js]
  subsuite = clipboard
- [browser_webconsole_context_menu_object_in_sidebar.js]
  [browser_webconsole_context_menu_open_url.js]
  [browser_webconsole_context_menu_store_as_global.js]
 -[browser_webconsole_copy_link_location.js]

frg/work-js/mozilla-release/patches/1401958-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510052757 -3600
 # Node ID 4c387a97b26ed2c8eda0d013c03dddc6619b8d84
-# Parent  4af191813173743ea7363d78a26adf84909d8f26
+# Parent  d67c9ac0888bdbbb4fe96ea2501cade39576e97b
 Bug 1401958 - Remove browser_webconsole_copy_entire_message_context_menu.js; r=Honza.
 
 The test already exists with a different name (browser_webconsole_context_menu_copy_entire_message).
@@ -12,13 +12,13 @@ MozReview-Commit-ID: 9NmXosnAVAi
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -260,20 +260,16 @@ skip-if = (os == 'linux' && bits == 32 &
+@@ -263,20 +263,16 @@ subsuite = clipboard
+ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_link_location.js]
  subsuite = clipboard
  skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_object.js]
  subsuite = clipboard
- [browser_webconsole_context_menu_object_in_sidebar.js]
  [browser_webconsole_context_menu_open_url.js]
  [browser_webconsole_context_menu_store_as_global.js]
 -[browser_webconsole_copy_entire_message_context_menu.js]

frg/work-js/mozilla-release/patches/1403452-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510217128 -3600
 # Node ID 3dac33fd437c414381b27dcda649613e27f9a949
-# Parent  a3c61146f972ea039a96f79825a0b648ce457b45
+# Parent  cda492e7395cf6033f3c659c29280220ac9dc049
 Bug 1403452 - Enable browser_webconsole_block_mixedcontent_securityerrors in new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: KBd0K20pDeQ
@@ -10,7 +10,7 @@ MozReview-Commit-ID: KBd0K20pDeQ
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -214,18 +214,16 @@ subsuite = clipboard
+@@ -219,18 +219,16 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_no_input_change_and_tab_key_pressed.js]
  [browser_jsterm_popup_close_on_tab_switch.js]
  [browser_jsterm_popup.js]
@@ -21,14 +21,14 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  tags = mcb
 -skip-if = true #       Bug 1403452
 -# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_assert.js]
- skip-if = true #       Bug 1403458
- [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
- skip-if = true # Bug 1408916
- [browser_webconsole_autocomplete_JSTerm_helpers.js]
- skip-if = true # Bug 1408917
- [browser_webconsole_autocomplete_accessibility.js]
- skip-if = true # Bug 1408918
+ [browser_webconsole_batching.js]
+ [browser_webconsole_block_mixedcontent_securityerrors.js]
+ tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
+ [browser_webconsole_cached_messages.js]
+ [browser_webconsole_cd_iframe.js]
+ skip-if = true #       Bug 1406030
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -153,19 +153,21 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
  Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
  registerCleanupFunction(function* () {
    Services.prefs.clearUserPref("devtools.webconsole.new-frontend-enabled");
+   Services.prefs.clearUserPref("devtools.webconsole.ui.filterbar");
  
    // Reset all filter prefs between tests. First flushPrefEnv in case one of the
    // filter prefs has been pushed for the test
-   yield SpecialPowers.flushPrefEnv();
-@@ -265,8 +266,32 @@ async function checkClickOnNode(hud, too
- 
- /**
-  * Returns true if the give node is currently focused.
+@@ -357,9 +358,33 @@ async function openDebugger(options = {}
+  *        Defaults to current selected tab.
+  * @return Promise
+  *         A promise that is resolved with the console hud once the web console is open.
   */
- function hasFocus(node) {
-   return node.ownerDocument.activeElement == node
-     && node.ownerDocument.hasFocus();
- }
+ async function openConsole(tab) {
+   let target = TargetFactory.forTab(tab || gBrowser.selectedTab);
+   const toolbox = await gDevTools.showToolbox(target, "webconsole");
+   return toolbox.getCurrentPanel().hud;
+-};
++}
 +
 +/**
 + * Fake clicking a link and return the URL we would have navigated to.

frg/work-js/mozilla-release/patches/1403458-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508834729 -7200
 # Node ID 1f415318428ed52e300b9f2c5c41064dec1dea68
-# Parent  8e4352134bcc15f249a5a36a0712e431213d523e
+# Parent  f817f182d420971bb34f91600939845cf0b73b6b
 Bug 1403458 - Convert browser_webconsole_assert.js to a backend test; r=bgrins.
 
 The test ensures that packet are sent for falsy console.assert calls,
@@ -14,12 +14,12 @@ MozReview-Commit-ID: C9QpXfBySLo
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -96,17 +96,16 @@ support-files =
+@@ -95,17 +95,16 @@ support-files =
+   test-bug-869003-iframe.html
+   test-bug-869003-top-window.html
    test-bug-952277-highlight-nodes-in-vview.html
    test-bug-989025-iframe-parent.html
    test-certificate-messages.html
-   test-click-function-to-source.html
-   test-click-function-to-source.js
    test-closure-optimized-out.html
    test-closures.html
    test-console-api-stackframe.html
@@ -32,25 +32,25 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-console-filters.html
    test-console-group.html
    test-console-output-02.html
-@@ -215,18 +214,16 @@ skip-if = true #       Bug 1403188
+@@ -206,18 +205,16 @@ skip-if = true #       Bug 1403188
+ [browser_jsterm_no_autocompletion_on_defined_variables.js]
+ [browser_jsterm_no_input_and_tab_key_pressed.js]
  [browser_jsterm_no_input_change_and_tab_key_pressed.js]
- [browser_jsterm_popup_close_on_tab_switch.js]
- [browser_jsterm_popup.js]
- [browser_jsterm_selfxss.js]
- subsuite = clipboard
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 -[browser_webconsole_assert.js]
 -skip-if = true #       Bug 1403458
+ [browser_webconsole_autocomplete_and_selfxss.js]
+ subsuite = clipboard
+ skip-if = true #       Bug 1404850
+ # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_autocomplete_crossdomain_iframe.js]
  skip-if = true # Bug 1408919
  [browser_webconsole_autocomplete_in_debugger_stackframe.js]
  skip-if = true # Bug 1408920
- [browser_webconsole_batching.js]
- [browser_webconsole_block_mixedcontent_securityerrors.js]
- tags = mcb
- [browser_webconsole_cached_autocomplete.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_assert.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_assert.js
 deleted file mode 100644
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_assert.js

frg/work-js/mozilla-release/patches/1403814-3-58a1.patch

@@ -2,7 +2,7 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1509711791 -3600
 # Node ID 0c4ecb84046395afd7c5ed4a250b64991c9b0da7
-# Parent  16b908d193a9d66d36ee9ebae640cd89550c9851
+# Parent  52fa916cb36f60981d07ef7c9d93b57daf6cbe28
 Bug 1403814 - Block toplevel data: URI navigations only if openend in the browser. r=smaug
 
 diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp
@@ -54,7 +54,7 @@ diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURICon
 diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
 --- a/docshell/base/nsDocShell.cpp
 +++ b/docshell/base/nsDocShell.cpp
-@@ -9826,29 +9826,16 @@ nsDocShell::InternalLoad(nsIURI* aURI,
+@@ -9910,29 +9910,16 @@ nsDocShell::InternalLoad(nsIURI* aURI,
        // an iframe since that's more common.
        contentType = nsIContentPolicy::TYPE_INTERNAL_IFRAME;
      }
@@ -84,7 +84,7 @@ diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
    if (!targetDocShell && !aWindowTarget.IsEmpty()) {
      MOZ_ASSERT(contentType == nsIContentPolicy::TYPE_DOCUMENT,
                 "opening a new window requires type to be TYPE_DOCUMENT");
-@@ -11002,16 +10989,17 @@ nsDocShell::DoURILoad(nsIURI* aURI,
+@@ -11086,16 +11073,17 @@ nsDocShell::DoURILoad(nsIURI* aURI,
        new LoadInfo(loadingWindow, aTriggeringPrincipal, topLevelLoadingContext,
                     securityFlags) :
        new LoadInfo(loadingPrincipal, aTriggeringPrincipal, loadingNode,
@@ -330,7 +330,7 @@ diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp
                            loadInfoArgs.originAttributes(),
                            redirectChainIncludingInternalRedirects,
                            redirectChain,
-                           std::move(ancestorPrincipals),
+                           Move(ancestorPrincipals),
                            loadInfoArgs.ancestorOuterWindowIDs(),
                            loadInfoArgs.corsUnsafeHeaders(),
                            loadInfoArgs.forcePreflight(),
@@ -444,7 +444,7 @@ diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
    , mInitialSecurityCheckDone(aInitialSecurityCheckDone)
    , mIsThirdPartyContext(aIsThirdPartyContext)
    , mOriginAttributes(aOriginAttributes)
-   , mAncestorPrincipals(std::move(aAncestorPrincipals))
+   , mAncestorPrincipals(Move(aAncestorPrincipals))
    , mAncestorOuterWindowIDs(aAncestorOuterWindowIDs)
    , mCorsUnsafeHeaders(aCorsUnsafeHeaders)
    , mForcePreflight(aForcePreflight)

frg/work-js/mozilla-release/patches/1403870-2-58a1.patch

@@ -2,13 +2,13 @@
 # User Christoph Kerschbaumer <ckerschb@christophkerschbaumer.com>
 # Date 1509712021 -3600
 # Node ID b66649cd261a06335e8b052b1cab15b78744465e
-# Parent  62b9a11993c47eaea11b677f49180e16f3b20fc6
+# Parent  1db6c1f37239803c4ee140e298e0e68735157ef2
 Bug 1403870: Test toplevel data URI navigation to application/json is allowed. r=smaug
 
 diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general/mochitest.ini
 --- a/dom/security/test/general/mochitest.ini
 +++ b/dom/security/test/general/mochitest.ini
-@@ -25,16 +25,18 @@ support-files =
+@@ -12,8 +12,10 @@ support-files =
  [test_nosniff.html]
  [test_block_script_wrong_mime.html]
  [test_block_toplevel_data_navigation.html]
@@ -19,14 +19,6 @@ diff --git a/dom/security/test/general/mochitest.ini b/dom/security/test/general
  skip-if = toolkit == 'android'
 +[test_allow_opening_data_json.html]
 +skip-if = toolkit == 'android'
- [test_same_site_cookies_subrequest.html]
- [test_same_site_cookies_toplevel_nav.html]
- [test_same_site_cookies_cross_origin_context.html]
- [test_same_site_cookies_from_script.html]
- [test_same_site_cookies_redirect.html]
- [test_same_site_cookies_toplevel_set_cookie.html]
- [test_same_site_cookies_iframe.html]
- [test_same_site_cookies_about.html]
 diff --git a/dom/security/test/general/test_allow_opening_data_json.html b/dom/security/test/general/test_allow_opening_data_json.html
 new file mode 100644
 --- /dev/null

frg/work-js/mozilla-release/patches/1403899-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510563765 -3600
 # Node ID d720dddd8e4e22f6470efb35f0b795e3dd899376
-# Parent  daacc7e4826e82a15db8ac31f2d4d2324621e99a
+# Parent  0f35f0daecdecd71b199d574b1e6386a928e2c54
 Bug 1403899 - Enable browser_webconsole_block_mixedcontent_securityerrors.js in new console frontend; r=Honza.
 
 MozReview-Commit-ID: 5rCahlZBOGy
@@ -10,25 +10,25 @@ MozReview-Commit-ID: 5rCahlZBOGy
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -229,18 +229,16 @@ skip-if = true # Bug 1408917
- skip-if = true # Bug 1408918
- [browser_webconsole_autocomplete_crossdomain_iframe.js]
- skip-if = true # Bug 1408919
- [browser_webconsole_autocomplete_in_debugger_stackframe.js]
- skip-if = true # Bug 1408920
+@@ -222,18 +222,16 @@ skip-if = true #       Bug 1403188
+ [browser_jsterm_selfxss.js]
+ subsuite = clipboard
+ [browser_netmonitor_shows_reqs_in_webconsole.js]
+ [browser_webconsole_allow_mixedcontent_securityerrors.js]
+ tags = mcb
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
 -skip-if = true #       Bug 1403899
 -# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_cached_autocomplete.js]
- skip-if = true # Bug 1408924
  [browser_webconsole_cached_messages.js]
- skip-if = true #       Bug 1406069
  [browser_webconsole_cd_iframe.js]
  skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
- skip-if = true # Bug 1408925
+ [browser_webconsole_charset.js]
+ skip-if = true #       Bug 1404400
+ [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js

frg/work-js/mozilla-release/patches/1404392-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1515430971 -3600
 # Node ID 6575fa09e55f5405a69b7c64c050174cd0536922
-# Parent  888bb98e2bbae19e91daa5093d1beb169015a3df
+# Parent  243c91f0196ed7508a2b24e8d5ea4ffa6e31b246
 Bug 1404392 - Enable and refactor browser_webconsole_filter_scroll.js to check that filtering does not affect scroll position; r=bgrins.
 
 MozReview-Commit-ID: DEZDnblICnh
@@ -25,9 +25,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_highlighter_console_helper.js]
  [browser_webconsole_history_arrow_keys.js]
  [browser_webconsole_hpkp_invalid-headers.js]
+ skip-if = true #       Bug 1405340
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_hsts_invalid-headers.js]
- [browser_webconsole_iframe_wrong_hud.js]
- skip-if = true #       Bug 1404378
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js

frg/work-js/mozilla-release/patches/1404400-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510732678 -3600
 # Node ID 1c30145251a460fc34d1ca50a718dff3b911fa45
-# Parent  739d3b9fe1b204b63ee3290b3dd6f757fa0704c1
+# Parent  e62701fc7fd1994262a0fba330eb59778ad6861e
 Bug 1404400 - Delete browser_webconsole_charset.js from new frontend;r=Honza.
 
 This test was checking the HTTPinspector by directly calling a WebConsoleClient function
@@ -13,7 +13,7 @@ MozReview-Commit-ID: LxjhhO2rB0W
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -50,18 +50,16 @@ support-files =
+@@ -51,18 +51,16 @@ support-files =
    test-bug-595934-malformedxml.xhtml
    test-bug-595934-svg.xhtml
    test-bug-595934-workers.html
@@ -44,9 +44,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 -[browser_webconsole_charset.js]
 -skip-if = true #       Bug 1404400
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
  [browser_webconsole_completion.js]

frg/work-js/mozilla-release/patches/1404850-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508836082 -7200
 # Node ID dfc3f11935aa57dbb750007a59c1758933cb957e
-# Parent  645daa96c822f973bb5b41c3f61b7ce1569f5a13
+# Parent  a6330864a975d71e8fa0b69c2e8d97ecc177e4ae
 Bug 1404850 - Fix self-XSS protection in new console and enable test; r=Honza.
 
 The self-XSS protection was broken since the switch to an HTML document. We
@@ -163,7 +163,7 @@ diff --git a/devtools/client/webconsole/jsterm.js b/devtools/client/webconsole/j
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -209,33 +209,31 @@ subsuite = clipboard
+@@ -209,25 +209,23 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_dollar.js]
  [browser_jsterm_history_persist.js]
  [browser_jsterm_inspect.js]
@@ -179,14 +179,6 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  tags = mcb
  skip-if = true #       Bug 1403452
  # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_assert.js]
- skip-if = true #       Bug 1403458
- [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
- skip-if = true # Bug 1408916
- [browser_webconsole_autocomplete_JSTerm_helpers.js]
- skip-if = true # Bug 1408917
- [browser_webconsole_autocomplete_accessibility.js]
- skip-if = true # Bug 1408918
 -[browser_webconsole_autocomplete_and_selfxss.js]
 -subsuite = clipboard
 -skip-if = true #       Bug 1404850

frg/work-js/mozilla-release/patches/1404853-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1512971660 -3600
 # Node ID e14fbde5349138be557996ca3f55c687ebcfb7be
-# Parent  c6dc85434c9b44caf19cfe1adc5c4ae0e47a614f
+# Parent  47e06e15f5b50ba675a83ca3393f81cee99a4291
 Bug 1404853 - Enable browser_webconsole_highlighter_console_helper.js in new console frontend; r=Honza.
 
 This changes the code of the test since it was relying on direct access to the content page.
@@ -22,7 +22,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    testscript.js
    !/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
    !/image/test/mochitest/blue.png
-   !/devtools/client/shared/test/shared-head.js
+   !/devtools/client/framework/test/shared-head.js
 +  !/devtools/client/shared/test/test-actor.js
 +  !/devtools/client/shared/test/test-actor-registry.js
 +
@@ -47,12 +47,12 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 -# old console skip-if = true # Requires direct access to content nodes
  [browser_webconsole_history_arrow_keys.js]
  [browser_webconsole_hpkp_invalid-headers.js]
+ skip-if = true #       Bug 1405340
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_hsts_invalid-headers.js]
+ skip-if = true #       Bug 1405341
+ # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_webconsole_iframe_wrong_hud.js]
- skip-if = true #       Bug 1404378
- [browser_webconsole_ineffective_iframe_sandbox_warning.js]
- skip-if = true #       Bug 1404883
- # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
@@ -226,7 +226,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
  /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
  /* Any copyright is dedicated to the Public Domain.
   * http://creativecommons.org/publicdomain/zero/1.0/ */
- /* import-globals-from ../../../../shared/test/shared-head.js */
+ /* import-globals-from ../../../../framework/test/shared-head.js */
  /* eslint no-unused-vars: [2, {"vars": "local"}] */
  
  "use strict";
@@ -239,7 +239,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
  // shared-head.js handles imports, constants, and utility functions
  // Load the shared-head file first.
  Services.scriptloader.loadSubScript(
-   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
+   "chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
    this);
  
  var {HUDService} = require("devtools/client/webconsole/hudservice");

frg/work-js/mozilla-release/patches/1404877-60a1.patch

@@ -2,7 +2,7 @@
 # User sole <spenades@mozilla.com>
 # Date 1518791109 0
 # Node ID 06c8e6e3303cb4787fb15038d074301e84342726
-# Parent  8e950503e00f2d56de53175ea8a88fb1e38c383c
+# Parent  3bd43bdd920044c3965eb138722828ef36141ebd
 Bug 1404877 - Migrate browser_webconsole_bug_658368_time_methods.js to the new frontend. r=nchevobbe
 
 MozReview-Commit-ID: 3Z6097zECDn
@@ -45,7 +45,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    testscript.js
    !/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
    !/image/test/mochitest/blue.png
-   !/devtools/client/shared/test/shared-head.js
+   !/devtools/client/framework/test/shared-head.js
 @@ -346,16 +346,15 @@ subsuite = clipboard
  [browser_webconsole_split_escape_key.js]
  [browser_webconsole_split_focus.js]

frg/work-js/mozilla-release/patches/1405340-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1515743773 -3600
 # Node ID cdae594745cdb4a77cae7bae4e662af3212f2a79
-# Parent  b9e6d6d12f97178c447f9a42e1428bc2e897305b
+# Parent  4224d25a6518abc768e47360ed3a83b5fafe8919
 Bug 1405340 - Enable browser_webconsole_hpkp_onvalid-headers.js in new console frontend;r=Honza.
 
 MozReview-Commit-ID: 4bcZR2HrFOd
@@ -10,14 +10,14 @@ MozReview-Commit-ID: 4bcZR2HrFOd
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -323,18 +323,16 @@ skip-if = true #       Bug 1404853
- # old console skip-if = true # Requires direct access to content nodes
- [browser_webconsole_history.js]
- skip-if = true # Bug 1408938
+@@ -275,18 +275,16 @@ skip-if = (e10s && debug) || (e10s && os
+ [browser_webconsole_file_uri.js]
+ skip-if = true #       Bug 1404382
+ [browser_webconsole_filter_scroll.js]
+ [browser_webconsole_filters.js]
+ [browser_webconsole_filters_persist.js]
+ [browser_webconsole_highlighter_console_helper.js]
  [browser_webconsole_history_arrow_keys.js]
- skip-if = true # Bug 1408939
- [browser_webconsole_history_nav.js]
- skip-if = true # Bug 1408940
  [browser_webconsole_hpkp_invalid-headers.js]
 -skip-if = true #       Bug 1405340
 -# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001

frg/work-js/mozilla-release/patches/1405341-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1516007717 -3600
 # Node ID b8e40648ed1a82c94f1f2194a8f28ebd7329befa
-# Parent  ce47fe177e581526f2fd4f8a8338f01f287ac7a6
+# Parent  f3a69bf7abf00aac2d80469804cfb287503cea00
 Bug 1405341 - Enable browser_webconsole_hsts_invalid-headers.js in new console frontend;r=Honza."
 
 MozReview-Commit-ID: JeAMdv3MpK7
@@ -10,13 +10,13 @@ MozReview-Commit-ID: JeAMdv3MpK7
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -324,18 +324,16 @@ skip-if = true #       Bug 1404853
- [browser_webconsole_history.js]
- skip-if = true # Bug 1408938
+@@ -276,18 +276,16 @@ skip-if = (e10s && debug) || (e10s && os
+ skip-if = true #       Bug 1404382
+ [browser_webconsole_filter_scroll.js]
+ [browser_webconsole_filters.js]
+ [browser_webconsole_filters_persist.js]
+ [browser_webconsole_highlighter_console_helper.js]
  [browser_webconsole_history_arrow_keys.js]
- skip-if = true # Bug 1408939
- [browser_webconsole_history_nav.js]
- skip-if = true # Bug 1408940
  [browser_webconsole_hpkp_invalid-headers.js]
  [browser_webconsole_hsts_invalid-headers.js]
 -skip-if = true #       Bug 1405341

frg/work-js/mozilla-release/patches/1405636-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1515487710 -3600
 # Node ID 5f6417128acb05b280c3c59a611e605458214dfd
-# Parent  0effc64f1fe302e32c4dd748365df5ba0d3942d8
+# Parent  d5fff3aa2a2a1d3f9e80189c698699916db02026
 Bug 1405636 - enable and rename browser_webconsole_netlogging_reset_filter.js;r=Honza
 
 MozReview-Commit-ID: IcFW6itKo7I
@@ -10,7 +10,7 @@ MozReview-Commit-ID: IcFW6itKo7I
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -317,24 +317,23 @@ skip-if = true #       Bug 1403448
+@@ -321,23 +321,22 @@ skip-if = true #       Bug 1403448
  skip-if = true #       Bug 1403448
  [browser_webconsole_message_categories.js]
  skip-if = true #       Bug 1404384
@@ -25,7 +25,6 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_network_exceptions.js]
  [browser_webconsole_network_messages_expand.js]
  [browser_webconsole_network_messages_openinnet.js]
- [browser_webconsole_network_messages_status_code.js]
  [browser_webconsole_network_requests_from_chrome.js]
 +[browser_webconsole_network_reset_filter.js]
  [browser_webconsole_nodes_highlight.js]
@@ -229,7 +228,7 @@ rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_w
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -484,8 +484,51 @@ function openNewBrowserWindow() {
+@@ -448,8 +448,51 @@ function openNewBrowserWindow() {
      Services.obs.addObserver(function observer(subject, topic) {
        if (win == subject) {
          Services.obs.removeObserver(observer, topic);

frg/work-js/mozilla-release/patches/1405652-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508482687 -7200
 # Node ID 810825b3ce199c6efe4efe5ffa6c8a69d3c9733f
-# Parent  c8418a2a9d45b8004265b958a800d1b0e28e2e96
+# Parent  2a6358d3371aba55b0753eefd336d67c2b1fb09e
 Bug 1405652 - Enable browser_webconsole_view_source.js in new console frontend; r=bgrins.
 
 MozReview-Commit-ID: DctteBfNgtC
@@ -10,7 +10,7 @@ MozReview-Commit-ID: DctteBfNgtC
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -457,17 +457,15 @@ skip-if = true #       Bug 1405650
+@@ -462,16 +462,14 @@ skip-if = true #       Bug 1405650
  # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_variables_view_dont_sort_non_sortable_classes_properties.js]
  skip-if = true #       Bug 1403196
@@ -24,7 +24,6 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_violation.js]
  skip-if = true #       Bug 1405245
  # old console skip-if = e10s && (os == 'win') # Bug 1264955
- [browser_webconsole_visibility_messages.js]
  [browser_webconsole_warn_about_replaced_api.js]
  [browser_webconsole_websocket.js]
  skip-if = true # Bug 1408950

frg/work-js/mozilla-release/patches/1406030-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510651632 -3600
 # Node ID 4e08a94eae25b6c3a2c2baed7da1374aaf1a1dbb
-# Parent  2297ad38cbad4c857004912837a43a543a3cf10c
+# Parent  c943f20341b0964294a1cb37c654e2e3bd0041bc
 Bug 1406030 - Enable browser_webconsole_cd_iframe.js in new frontend; r=Honza.
 
 Once the test was migrated, it was failing because we did not show
@@ -164,24 +164,24 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-bug-644419-log-limits.html
    test-bug-646025-console-file-location.html
    test-bug-658368-time-methods.html
-@@ -234,17 +234,16 @@ skip-if = true # Bug 1408920
+@@ -224,17 +224,16 @@ subsuite = clipboard
+ [browser_netmonitor_shows_reqs_in_webconsole.js]
+ [browser_webconsole_allow_mixedcontent_securityerrors.js]
+ tags = mcb
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
- [browser_webconsole_cached_autocomplete.js]
- skip-if = true # Bug 1408924
  [browser_webconsole_cached_messages.js]
- skip-if = true #       Bug 1406069
  [browser_webconsole_cd_iframe.js]
 -skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
- skip-if = true # Bug 1408925
- # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
  [browser_webconsole_charset.js]
  skip-if = true #       Bug 1404400
- [browser_webconsole_chrome.js]
- skip-if = true # Bug 1408926
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
+ [browser_webconsole_clickable_urls.js]
+ [browser_webconsole_closing_after_completion.js]
+ skip-if = true # Bug 1408927
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js

frg/work-js/mozilla-release/patches/1406038-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1514999194 -3600
 # Node ID 343e6d3828bdacf54d02c79a9e9116837f3b00f1
-# Parent  24a10279524c3d4606c2de6f729ded1d2a620c68
+# Parent  f4e2c7ef891a9198cdcd433b7eddebefa9577f7d
 Bug 1406038 - Rename and enable browser_webconsole_bug_1050691_click_function_to_source.js in new console frontend; r=bgrins.
 
 The test differs a bit from the old one since we are now testing that there is
@@ -13,11 +13,11 @@ MozReview-Commit-ID: DnC5uJ3pAea
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -19,18 +19,16 @@ support-files =
-   test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^
-   test_bug1092055_shouldwarn.html
-   test_bug1092055_shouldwarn.js
-   test_bug1092055_shouldwarn.js^headers^
+@@ -15,18 +15,16 @@ support-files =
+   test_bug_770099_violation.html
+   test_bug_770099_violation.html^headers^
+   test_console_csp_ignore_reflected_xss_message.html
+   test_console_csp_ignore_reflected_xss_message.html^headers^
    test_hpkp-invalid-headers.sjs
    test_hsts-invalid-headers.sjs
    test-autocomplete-in-stackframe.html
@@ -32,43 +32,43 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-bug-593003-iframe-wrong-hud-iframe.html
    test-bug-593003-iframe-wrong-hud.html
    test-bug-595934-canvas-css.html
-@@ -92,16 +90,18 @@ support-files =
-   test-bug-782653-css-errors.html
-   test-bug-837351-security-errors.html
-   test-bug-859170-longstring-hang.html
-   test-bug-869003-iframe.html
-   test-bug-869003-top-window.html
-   test-bug-952277-highlight-nodes-in-vview.html
-   test-bug-989025-iframe-parent.html
+@@ -83,16 +81,18 @@ support-files =
+   test-cd-iframe-child.html
+   test-cd-iframe-parent.html
+   test-console-api-iframe.html
+   test-cspro.html
+   test-cspro.html^headers^
+   test-iframe-child.html
+   test-iframe-parent.html
    test-certificate-messages.html
 +  test-click-function-to-source.html
 +  test-click-function-to-source.js
    test-closure-optimized-out.html
    test-closures.html
    test-console-api-stackframe.html
-   test-console-assert.html
    test-console-clear.html
    test-console-column.html
    test-console-count-external-file.js
    test-console-count.html
-@@ -249,17 +249,16 @@ skip-if = true #       Bug 1406030
+   test-console-extras.html
+@@ -232,17 +232,16 @@ subsuite = clipboard
+ tags = mcb
+ [browser_webconsole_batching.js]
+ [browser_webconsole_block_mixedcontent_securityerrors.js]
+ tags = mcb
+ [browser_webconsole_cached_messages.js]
+ [browser_webconsole_cd_iframe.js]
  [browser_webconsole_certificate_messages.js]
- skip-if = true # Bug 1408925
- # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
- [browser_webconsole_charset.js]
- skip-if = true #       Bug 1404400
- [browser_webconsole_chrome.js]
- skip-if = true # Bug 1408926
  [browser_webconsole_click_function_to_source.js]
--skip-if = true #       Bug 1406038
+-skip-if = true # Bug 1406038
  [browser_webconsole_clickable_urls.js]
+ [browser_webconsole_close_unfocused_window.js]
  [browser_webconsole_closing_after_completion.js]
- skip-if = true # Bug 1408927
- [browser_webconsole_closing_brackets.js]
- skip-if = true # Bug 1408928
  [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
- skip-if = true #       Bug 1405250
+ skip-if = true # Bug 1405250
+ [browser_webconsole_console_api_iframe.js]
+ [browser_webconsole_console_dir.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js

frg/work-js/mozilla-release/patches/1406061-58a1.patch

@@ -2,7 +2,7 @@
 # User Patrick Brosset <pbrosset@mozilla.com>
 # Date 1508399899 -7200
 # Node ID fc6cfc87908b324a06d742a8e573728f077ed331
-# Parent  d163aa353984332f1225df246da7b3cc563b9b55
+# Parent  42e238990e153aa476bae6a522a53ea35d372244
 Bug 1406061 - Remove the unused Jsbeautify.jsm module; r=jdescottes
 
 MozReview-Commit-ID: KF39qXJ2s11
@@ -31,7 +31,7 @@ deleted file mode 100644
 diff --git a/devtools/client/shared/moz.build b/devtools/client/shared/moz.build
 --- a/devtools/client/shared/moz.build
 +++ b/devtools/client/shared/moz.build
-@@ -29,17 +29,16 @@ DevToolsModules(
+@@ -26,17 +26,16 @@ DevToolsModules(
      'developer-toolbar.js',
      'devices.js',
      'DOMHelpers.jsm',
@@ -65,8 +65,8 @@ diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json
    "jsdebugger.jsm": ["addDebuggerToGlobal"],
    "json2.js": ["JSON"],
    "keys.js": ["BulkKeyBundle", "SyncKeyBundle"],
+   "KeyValueParser.jsm": ["parseKeyValuePairsFromLines", "parseKeyValuePairs", "parseKeyValuePairsFromFile", "parseKeyValuePairsFromFileAsync"],
    "kinto-http-client.js": ["KintoHttpClient"],
    "kinto-offline-client.js": ["Kinto"],
    "kinto-storage-adapter.js": ["FirefoxAdapter"],
    "L10nRegistry.jsm": ["L10nRegistry", "FileSource", "IndexedFileSource"],
-   "loader-plugin-raw.jsm": ["requireRawId"],

frg/work-js/mozilla-release/patches/1406069-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509957796 -3600
 # Node ID deaf42e9dbecacba453afa921cad45f3dfeebc6c
-# Parent  e69006824024abdda5f7c751633f0d03de4a72c3
+# Parent  c15c89863202974836baec4fa0a6435ed266b47c
 Bug 1406069 - Enable browser_webconsole_cached_messages.js in new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: EypyZoZUWeo
@@ -10,24 +10,24 @@ MozReview-Commit-ID: EypyZoZUWeo
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -222,17 +222,16 @@ skip-if = true #       Bug 1403188
- subsuite = clipboard
- [browser_netmonitor_shows_reqs_in_webconsole.js]
- [browser_webconsole_allow_mixedcontent_securityerrors.js]
- tags = mcb
+@@ -225,17 +225,16 @@ tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_cached_messages.js]
 -skip-if = true #       Bug 1406069
  [browser_webconsole_cd_iframe.js]
+ skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
  skip-if = true # Bug 1408925
  # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
  [browser_webconsole_charset.js]
  skip-if = true #       Bug 1404400
  [browser_webconsole_chrome.js]
- skip-if = true # Bug 1408926
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
@@ -124,15 +124,17 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -353,16 +353,31 @@ async function openDebugger(options = {}
+@@ -343,8 +343,23 @@ async function openDebugger(options = {}
+   let panel = toolbox.getCurrentPanel();
+ 
    // Do not clear VariableView lazily so it doesn't disturb test ending.
    panel._view.Variables.lazyEmpty = false;
  
    await panel.panelWin.DebuggerController.waitForSourcesLoaded();
    return {target, toolbox, panel};
  }
- 
- /**
++
++/**
 + * Open the Web Console for the given tab, or the current one if none given.
 + *
 + * @param nsIDOMElement tab
@@ -146,13 +148,3 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
 +  const toolbox = await gDevTools.showToolbox(target, "webconsole");
 +  return toolbox.getCurrentPanel().hud;
 +};
-+
-+/**
-  * Fake clicking a link and return the URL we would have navigated to.
-  * This function should be used to check external links since we can't access
-  * network in tests.
-  * This can also be used to test that a click will not be fired.
-  *
-  * @param ElementNode element
-  *        The <a> element we want to simulate click on.
-  * @param Object clickEventProps

frg/work-js/mozilla-release/patches/1406551-58a1.patch

@@ -2,7 +2,7 @@
 # User Jason Laster <jason.laster.11@gmail.com>
 # Date 1507645860 14400
 # Node ID 57594aa694df452e8a82ec778dc77a475e2e7657
-# Parent  52f2ab718097b4af257722d3583fc9338aa3bff4
+# Parent  16f833f82961dd81aeeeaecb8ce8a4757c13ce24
 Bug 1406551 - Update Debugger frontend (10-8). r=jdescottes
 
 MozReview-Commit-ID: GRBFwFsL8Cs
@@ -415,8 +415,8 @@ diff --git a/devtools/client/debugger/new/debugger.css b/devtools/client/debugge
    position: absolute;
    top: auto;
    bottom: 0;
-   inset-inline-end: 0;
-   inset-inline-start: auto;
+   offset-inline-end: 0;
+   offset-inline-start: auto;
  }
  
 +.welcomebox .small-size-layout {
@@ -13978,13 +13978,13 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
 +  examples/reload/doc_reload.html
    examples/doc-async.html
    examples/doc-asm.html
-   examples/doc-content-script-sources.html
    examples/doc-scripts.html
    examples/doc-script-mutate.html
    examples/doc-script-switching.html
    examples/doc-exceptions.html
    examples/doc-iframes.html
-@@ -49,40 +52,42 @@ support-files =
+   examples/doc-frames.html
+@@ -48,37 +51,39 @@ support-files =
    examples/output.js
    examples/simple1.js
    examples/simple2.js
@@ -14004,8 +14004,6 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
  [browser_dbg-breakpoints-reloading.js]
  skip-if = true # Bug 1383576
  [browser_dbg-breakpoints-cond.js]
- [browser_dbg-browser-content-toolbox.js]
- skip-if = !e10s # This test is only valid in e10s
  [browser_dbg-call-stack.js]
 -[browser_dbg-expressions.js]
  [browser_dbg-scopes.js]
@@ -14013,7 +14011,6 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
  [browser_dbg-chrome-debugging.js]
  skip-if = debug # bug 1374187
  [browser_dbg-console.js]
- [browser_dbg-content-script-sources.js]
  [browser_dbg-debugger-buttons.js]
  [browser_dbg-editor-gutter.js]
  [browser_dbg-editor-select.js]
@@ -14028,7 +14025,7 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
  skip-if = true # Bug 1393121
  [browser_dbg-navigation.js]
  [browser_dbg-minified.js]
-@@ -102,8 +107,9 @@ skip-if = true # Bug 1393121, 1393299
+@@ -98,8 +103,9 @@ skip-if = true # Bug 1393121, 1393299
  [browser_dbg-sourcemaps-reloading.js]
  [browser_dbg-sourcemaps2.js]
  [browser_dbg-sourcemaps-bogus.js]
@@ -14036,7 +14033,7 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
  [browser_dbg-tabs.js]
  [browser_dbg-toggling-tools.js]
  [browser_dbg-wasm-sourcemaps.js]
- skip-if = true
+ skip-if = true 
 +[browser_dbg-reload.js]
 diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-expressions-error.js
 new file mode 100644
@@ -14268,7 +14265,7 @@ new file mode 100644
 diff --git a/devtools/client/debugger/new/test/mochitest/head.js b/devtools/client/debugger/new/test/mochitest/head.js
 --- a/devtools/client/debugger/new/test/mochitest/head.js
 +++ b/devtools/client/debugger/new/test/mochitest/head.js
-@@ -506,17 +506,17 @@ function stepOut(dbg) {
+@@ -499,17 +499,17 @@ function stepOut(dbg) {
   * @memberof mochitest/actions
   * @param {Object} dbg
   * @return {Promise}

frg/work-js/mozilla-release/patches/1407178-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510145137 -3600
 # Node ID 4619d49c91f51f1d1297332991f2bfe0c51d3518
-# Parent  ab21020360fffdfd1ca187fea2c97bbaf3aaec9e
+# Parent  b108c04ccfbbc5aa6c24091095d680478b78074e
 Bug 1407178 - Enable browser_webconsole_certificate_messages.js in the new console; r=Honza.
 
 MozReview-Commit-ID: HbspABuW7e4
@@ -10,14 +10,14 @@ MozReview-Commit-ID: HbspABuW7e4
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -225,18 +225,16 @@ subsuite = clipboard
- [browser_webconsole_allow_mixedcontent_securityerrors.js]
- tags = mcb
- [browser_webconsole_batching.js]
+@@ -229,18 +229,16 @@ skip-if = true #       Bug 1403452
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_cached_messages.js]
  [browser_webconsole_cd_iframe.js]
+ skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
 -skip-if = true # Bug 1408925
 -# old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
@@ -26,9 +26,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_chrome.js]
  skip-if = true # Bug 1408926
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
- skip-if = true # Bug 1408927
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
@@ -145,7 +145,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -211,17 +211,17 @@ function hideContextMenu(hud) {
+@@ -203,17 +203,17 @@ function hideContextMenu(hud) {
    let onPopupHidden = once(popup, "popuphidden");
    popup.hidePopup();
    return onPopupHidden;

frg/work-js/mozilla-release/patches/1407426-2-58a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1507625012 -7200
 # Node ID caef338370a531902aea56a36f3c8f9b6e41c501
-# Parent  f0c355254059dd1389c15433bae74b6760856542
+# Parent  962e601962b41aa0657c3c72a76de934a9a33bac
 Bug 1407426 - add smoke test for debugger in browser content toolbox;r=jlast
 
 This test is a simpler version of the breakpoints test, but runs from the
@@ -15,7 +15,7 @@ MozReview-Commit-ID: 5rSb7z3HP4F
 diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini
 --- a/devtools/client/debugger/new/test/mochitest/browser.ini
 +++ b/devtools/client/debugger/new/test/mochitest/browser.ini
-@@ -58,16 +58,18 @@ support-files =
+@@ -62,16 +62,18 @@ support-files =
  [browser_dbg-async-stepping.js]
  [browser_dbg-breaking.js]
  [browser_dbg-breaking-from-console.js]
@@ -27,14 +27,14 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
 +[browser_dbg-browser-content-toolbox.js]
 +skip-if = !e10s # This test is only valid in e10s
  [browser_dbg-call-stack.js]
- [browser_dbg-expressions.js]
  [browser_dbg-scopes.js]
  [browser_dbg-chrome-create.js]
  [browser_dbg-chrome-debugging.js]
  skip-if = debug # bug 1374187
  [browser_dbg-console.js]
  [browser_dbg-debugger-buttons.js]
-@@ -97,9 +99,9 @@ skip-if = true # Bug 1393121, 1393299
+ [browser_dbg-editor-gutter.js]
+@@ -102,10 +104,10 @@ skip-if = true # Bug 1393121, 1393299
  [browser_dbg-sourcemaps.js]
  [browser_dbg-sourcemaps-reloading.js]
  [browser_dbg-sourcemaps2.js]
@@ -45,6 +45,7 @@ diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/
  [browser_dbg-wasm-sourcemaps.js]
 -skip-if = true 
 +skip-if = true
+ [browser_dbg-reload.js]
 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
 new file mode 100644
 --- /dev/null

frg/work-js/mozilla-release/patches/1407840-58a1.patch

@@ -2,7 +2,7 @@
 # User Jason Laster <jason.laster.11@gmail.com>
 # Date 1507883267 -7200
 # Node ID 7e76eb11f03423e98ad3f4676d25de0e4dd508d3
-# Parent  14f35cc0552c991977dcbc6dc31b12801e001e40
+# Parent  b109c4facf53eb13fcfa47b8e8c568996b083074
 Bug 1407840 - Update Debugger frontend (10-12). r=jdescottes
 
 MozReview-Commit-ID: J6xJ6RGbnkZ
@@ -3276,7 +3276,8 @@ deleted file mode 100644
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -290,16 +290,19 @@ devtools.jar:
+@@ -291,8 +291,11 @@ devtools.jar:
+     skin/images/firebug/command-frames.svg (themes/images/firebug/command-frames.svg)
      skin/images/firebug/command-paintflashing.svg (themes/images/firebug/command-paintflashing.svg)
      skin/images/firebug/command-responsivemode.svg (themes/images/firebug/command-responsivemode.svg)
      skin/images/firebug/command-scratchpad.svg (themes/images/firebug/command-scratchpad.svg)
@@ -3284,18 +3285,9 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
      skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
      skin/images/firebug/command-rulers.svg (themes/images/firebug/command-rulers.svg)
      skin/images/firebug/command-noautohide.svg (themes/images/firebug/command-noautohide.svg)
- 
++
 +    # Debugger
 +    skin/images/debugger/arrow.svg (themes/images/debugger/arrow.svg)
-+
-     # Netmonitor
-     content/netmonitor/src/assets/styles/httpi.css (netmonitor/src/assets/styles/httpi.css)
-     content/netmonitor/src/assets/styles/MdnLink.css (netmonitor/src/assets/styles/MdnLink.css)
-     content/netmonitor/src/assets/styles/netmonitor.css (netmonitor/src/assets/styles/netmonitor.css)
-     content/netmonitor/src/assets/styles/NetworkDetailsPanel.css (netmonitor/src/assets/styles/NetworkDetailsPanel.css)
-     content/netmonitor/src/assets/styles/RequestList.css (netmonitor/src/assets/styles/RequestList.css)
-     content/netmonitor/src/assets/styles/StatisticsPanel.css (netmonitor/src/assets/styles/StatisticsPanel.css)
-     content/netmonitor/src/assets/styles/StatusBar.css (netmonitor/src/assets/styles/StatusBar.css)
 diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties
 --- a/devtools/client/locales/en-US/debugger.properties
 +++ b/devtools/client/locales/en-US/debugger.properties

frg/work-js/mozilla-release/patches/1408124-59a1.patch

@@ -2,7 +2,7 @@
 # User Greg Tatum <gtatum@mozilla.com>
 # Date 1510159003 21600
 # Node ID 48af4f2082c7a5501eb75cb02bba25ea0f99c517
-# Parent  27b426986c86d038b90414fe3ac402156f41b6c8
+# Parent  a762437fefd7607c25e6028c4a0d78ff072ce5fc
 Bug 1408124 - Create a new perf actor and recording panel; r=julienw
 
 This patch adds a new performance recording panel that interfaes with
@@ -161,7 +161,7 @@ diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/clie
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -57,16 +57,19 @@ devtools.jar:
+@@ -58,16 +58,19 @@ devtools.jar:
      content/webaudioeditor/views/utils.js (webaudioeditor/views/utils.js)
      content/webaudioeditor/views/context.js (webaudioeditor/views/context.js)
      content/webaudioeditor/views/inspector.js (webaudioeditor/views/inspector.js)
@@ -181,7 +181,7 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
      content/performance/views/details-js-call-tree.js (performance/views/details-js-call-tree.js)
      content/performance/views/details-js-flamegraph.js (performance/views/details-js-flamegraph.js)
      content/performance/views/details-memory-call-tree.js (performance/views/details-memory-call-tree.js)
-@@ -148,16 +151,17 @@ devtools.jar:
+@@ -150,16 +153,17 @@ devtools.jar:
      skin/images/breakpoint.svg (themes/images/breakpoint.svg)
      skin/webconsole.css (themes/webconsole.css)
      skin/images/webconsole.svg (themes/images/webconsole.svg)
@@ -1360,15 +1360,15 @@ new file mode 100644
 diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
 --- a/devtools/server/actors/moz.build
 +++ b/devtools/server/actors/moz.build
-@@ -36,16 +36,17 @@ DevToolsModules(
+@@ -35,16 +35,17 @@ DevToolsModules(
      'gcli.js',
      'heap-snapshot-file.js',
      'highlighters.css',
      'highlighters.js',
+     'inspector.js',
      'layout.js',
      'memory.js',
      'object.js',
-     'pause-scoped.js',
 +    'perf.js',
      'performance-recording.js',
      'performance.js',

frg/work-js/mozilla-release/patches/1408337-58a1.patch

@@ -2,15 +2,15 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1509461578 -3600
 # Node ID 4222ef3c65acaa88d89235dfa794247e5cbb8e15
-# Parent  43662c0d4177d6dfe4dcdcd8f6bea36a512caeca
+# Parent  63603c4e39b6b5fd4d20cdbf307cb084520d67c6
 Bug 1408337 - set devtools.enabled to true if toolbox was recently opened;r=bgrins
 
 MozReview-Commit-ID: RKprmycu6b
 
-diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-startup.js
---- a/devtools/startup/devtools-startup.js
-+++ b/devtools/startup/devtools-startup.js
-@@ -417,30 +417,42 @@ DevToolsStartup.prototype = {
+diff --git a/devtools/shim/devtools-startup.js b/devtools/shim/devtools-startup.js
+--- a/devtools/shim/devtools-startup.js
++++ b/devtools/shim/devtools-startup.js
+@@ -423,30 +423,42 @@ DevToolsStartup.prototype = {
        let window = enumerator.getNext();
        if (window.gBrowserInit && window.gBrowserInit.delayedStartupFinished) {
          this.updateDevToolsMenuItems(window);

frg/work-js/mozilla-release/patches/1408339-2only-PARTIAL-59a1.patch

@@ -2,15 +2,15 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1510159879 -3600
 # Node ID dfdc0642a2127037efe98f43c47b425e54c073f3
-# Parent  309106c52d3060e7e18a4c4bc7b81c94c1ac2d16
+# Parent  7c2d86ee11c5bfa9b3f94b0873ada620e9c82e6e
 Bug 1408339 - measure onboarding devtools user detection with telemetry;r=ochameau, datareview=francois
 
 MozReview-Commit-ID: G3edBYlyH8f
 
-diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-startup.js
---- a/devtools/startup/devtools-startup.js
-+++ b/devtools/startup/devtools-startup.js
-@@ -236,26 +236,32 @@ DevToolsStartup.prototype = {
+diff --git a/devtools/shim/devtools-startup.js b/devtools/shim/devtools-startup.js
+--- a/devtools/shim/devtools-startup.js
++++ b/devtools/shim/devtools-startup.js
+@@ -242,26 +242,32 @@ DevToolsStartup.prototype = {
      this.hookWindow(window);
  
      if (Services.prefs.getBoolPref(TOOLBAR_VISIBLE_PREF, false)) {

frg/work-js/mozilla-release/patches/1408562-58a1.patch

@@ -2,7 +2,7 @@
 # User Jason Laster <jason.laster.11@gmail.com>
 # Date 1508403949 -7200
 # Node ID 47bb399c0621cf47178dbb2360dabeda70dc5eb6
-# Parent  814292259b9dd07ea7a0d9f8b8c77d2cf078c424
+# Parent  5a7a532d96ccd6814b7127e4651029c5bd47f856
 Bug 1408562 - Update Debugger frontend (10-13). r=jdescottes
 
 MozReview-Commit-ID: 6qEViJ9Z2Nw
@@ -67992,7 +67992,7 @@ diff --git a/devtools/client/debugger/new/search-worker.js b/devtools/client/deb
 diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini
 --- a/devtools/client/debugger/new/test/mochitest/browser.ini
 +++ b/devtools/client/debugger/new/test/mochitest/browser.ini
-@@ -106,10 +106,10 @@ skip-if = true # Bug 1393121, 1393299
+@@ -104,10 +104,10 @@ skip-if = true # Bug 1393121, 1393299
  [browser_dbg-sourcemaps.js]
  [browser_dbg-sourcemaps-reloading.js]
  [browser_dbg-sourcemaps2.js]
@@ -68225,7 +68225,7 @@ diff --git a/devtools/client/debugger/new/test/mochitest/head.js b/devtools/clie
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -292,16 +292,18 @@ devtools.jar:
+@@ -294,8 +294,10 @@ devtools.jar:
      skin/images/firebug/command-scratchpad.svg (themes/images/firebug/command-scratchpad.svg)
      skin/images/firebug/command-screenshot.svg (themes/images/firebug/command-screenshot.svg)
      skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
@@ -68236,14 +68236,6 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
      skin/images/debugger/arrow.svg (themes/images/debugger/arrow.svg)
 +    skin/images/debugger/blackBox.svg (themes/images/debugger/blackBox.svg)
 +    skin/images/debugger/prettyPrint.svg (themes/images/debugger/prettyPrint.svg)
- 
-     # Netmonitor
-     content/netmonitor/src/assets/styles/httpi.css (netmonitor/src/assets/styles/httpi.css)
-     content/netmonitor/src/assets/styles/MdnLink.css (netmonitor/src/assets/styles/MdnLink.css)
-     content/netmonitor/src/assets/styles/netmonitor.css (netmonitor/src/assets/styles/netmonitor.css)
-     content/netmonitor/src/assets/styles/NetworkDetailsPanel.css (netmonitor/src/assets/styles/NetworkDetailsPanel.css)
-     content/netmonitor/src/assets/styles/RequestList.css (netmonitor/src/assets/styles/RequestList.css)
-     content/netmonitor/src/assets/styles/StatisticsPanel.css (netmonitor/src/assets/styles/StatisticsPanel.css)
 diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties
 --- a/devtools/client/locales/en-US/debugger.properties
 +++ b/devtools/client/locales/en-US/debugger.properties

frg/work-js/mozilla-release/patches/1408916-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508397399 -7200
 # Node ID 3bbd725cdba3dbebbb5553a747b2f9acbf064da2
-# Parent  6270360e94ebe8d5a4a31ec75e12d29bb7491687
+# Parent  c22273062f4ec454bb2c02312ab5e12c0f1e7c1d
 Bug 1408916 - Rename and enable browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js in the new console frontend; r=bgrins.
 
 MozReview-Commit-ID: DCFWNLGhCSM
@@ -10,15 +10,15 @@ MozReview-Commit-ID: DCFWNLGhCSM
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -198,16 +198,17 @@ skip-if = true #       Bug 1403188
+@@ -191,16 +191,17 @@ skip-if = true # Bug 1406060
+ [browser_console_webconsole_ctrlw_close_tab.js]
+ skip-if = true # Bug 1406060
+ [browser_console_webconsole_iframe_messages.js]
+ skip-if = true # Bug 1406060
+ [browser_console_webconsole_private_browsing.js]
+ skip-if = true #       Bug 1403188
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_jsterm_add_edited_input_to_history.js]
- [browser_jsterm_autocomplete_array_no_index.js]
- [browser_jsterm_autocomplete_escape_key.js]
- [browser_jsterm_autocomplete_inside_text.js]
- [browser_jsterm_autocomplete_nav_and_tab_key.js]
- [browser_jsterm_autocomplete_return_key_no_selection.js]
- [browser_jsterm_autocomplete_return_key.js]
 +[browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
  skip-if = true
@@ -28,13 +28,13 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_history_persist.js]
  [browser_jsterm_inspect.js]
  [browser_jsterm_no_autocompletion_on_defined_variables.js]
-@@ -217,18 +218,16 @@ subsuite = clipboard
- [browser_jsterm_popup.js]
- [browser_jsterm_selfxss.js]
- subsuite = clipboard
+@@ -208,18 +209,16 @@ subsuite = clipboard
+ [browser_jsterm_no_input_change_and_tab_key_pressed.js]
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_assert.js]
  skip-if = true #       Bug 1403458
 -[browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
@@ -43,10 +43,10 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  skip-if = true # Bug 1408917
  [browser_webconsole_autocomplete_accessibility.js]
  skip-if = true # Bug 1408918
- [browser_webconsole_autocomplete_crossdomain_iframe.js]
- skip-if = true # Bug 1408919
- [browser_webconsole_autocomplete_in_debugger_stackframe.js]
- skip-if = true # Bug 1408920
+ [browser_webconsole_autocomplete_and_selfxss.js]
+ subsuite = clipboard
+ skip-if = true #       Bug 1404850
+ # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js

frg/work-js/mozilla-release/patches/1408917-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508485254 -7200
 # Node ID 7265bb271a9bac8d97755c050eaf8d12888e9f26
-# Parent  e6a26bb93868629f746e41f5dc7083f79c71dedd
+# Parent  8dde1150f5ce6e968f657e1e6aa98b43f64f331b
 Bug 1408917 - Rename, refactor and enable browser_webconsole_autocomplete_JSTerm_helpers.js in new console frontend; r=Honza.
 
 MozReview-Commit-ID: 3TN6q63mnHp
@@ -10,43 +10,43 @@ MozReview-Commit-ID: 3TN6q63mnHp
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -194,16 +194,17 @@ skip-if = true # Bug 1406060
+@@ -191,16 +191,17 @@ skip-if = true # Bug 1406060
+ [browser_console_webconsole_ctrlw_close_tab.js]
+ skip-if = true # Bug 1406060
  [browser_console_webconsole_iframe_messages.js]
  skip-if = true # Bug 1406060
  [browser_console_webconsole_private_browsing.js]
  skip-if = true #       Bug 1403188
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_jsterm_add_edited_input_to_history.js]
- [browser_jsterm_autocomplete_array_no_index.js]
- [browser_jsterm_autocomplete_escape_key.js]
 +[browser_jsterm_autocomplete_helpers.js]
- [browser_jsterm_autocomplete_inside_text.js]
- [browser_jsterm_autocomplete_nav_and_tab_key.js]
- [browser_jsterm_autocomplete_return_key_no_selection.js]
- [browser_jsterm_autocomplete_return_key.js]
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
  skip-if = true
  subsuite = clipboard
-@@ -218,18 +219,16 @@ subsuite = clipboard
- [browser_jsterm_popup.js]
- [browser_jsterm_selfxss.js]
- subsuite = clipboard
+ # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
+ [browser_jsterm_dollar.js]
+ [browser_jsterm_history_persist.js]
+ [browser_jsterm_inspect.js]
+@@ -209,18 +210,16 @@ subsuite = clipboard
+ [browser_jsterm_no_input_change_and_tab_key_pressed.js]
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_assert.js]
  skip-if = true #       Bug 1403458
 -[browser_webconsole_autocomplete_JSTerm_helpers.js]
 -skip-if = true # Bug 1408917
  [browser_webconsole_autocomplete_accessibility.js]
  skip-if = true # Bug 1408918
+ [browser_webconsole_autocomplete_and_selfxss.js]
+ subsuite = clipboard
+ skip-if = true #       Bug 1404850
+ # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_autocomplete_crossdomain_iframe.js]
  skip-if = true # Bug 1408919
- [browser_webconsole_autocomplete_in_debugger_stackframe.js]
- skip-if = true # Bug 1408920
- [browser_webconsole_batching.js]
- [browser_webconsole_block_mixedcontent_securityerrors.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_JSTerm_helpers.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_JSTerm_helpers.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js

frg/work-js/mozilla-release/patches/1408918-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508742434 -7200
 # Node ID 85bf688121c0da7a63e7b6018f225d731f768ffb
-# Parent  a6496e6269120799c5f3437359d40bb1ed15a456
+# Parent  bc4926cda1fc17d72ea3b3724c0025a982250486
 Bug 1408918 - Rename and enable browser_webconsole_autocomplete_accessibility.js in new console frontend; r=Honza
 
 MozReview-Commit-ID: CknvP7M1rVJ
@@ -10,7 +10,7 @@ MozReview-Commit-ID: CknvP7M1rVJ
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -191,16 +191,17 @@ skip-if = true # Bug 1406060
+@@ -190,16 +190,17 @@ skip-if = true # Bug 1406060
  skip-if = true # Bug 1406060
  [browser_console_webconsole_ctrlw_close_tab.js]
  skip-if = true # Bug 1406060
@@ -21,32 +21,32 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
 +[browser_jsterm_accessibility.js]
  [browser_jsterm_add_edited_input_to_history.js]
- [browser_jsterm_autocomplete_array_no_index.js]
- [browser_jsterm_autocomplete_escape_key.js]
  [browser_jsterm_autocomplete_helpers.js]
- [browser_jsterm_autocomplete_inside_text.js]
- [browser_jsterm_autocomplete_nav_and_tab_key.js]
- [browser_jsterm_autocomplete_return_key_no_selection.js]
- [browser_jsterm_autocomplete_return_key.js]
-@@ -216,18 +217,16 @@ skip-if = true #       Bug 1403188
- [browser_jsterm_popup.js]
- [browser_jsterm_selfxss.js]
- subsuite = clipboard
+ [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
+ [browser_jsterm_copy_command.js]
+ [browser_jsterm_dollar.js]
+ [browser_jsterm_history_persist.js]
+ [browser_jsterm_inspect.js]
+ [browser_jsterm_no_autocompletion_on_defined_variables.js]
+@@ -207,18 +208,16 @@ skip-if = true #       Bug 1403188
+ [browser_jsterm_no_input_change_and_tab_key_pressed.js]
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_assert.js]
  skip-if = true #       Bug 1403458
 -[browser_webconsole_autocomplete_accessibility.js]
 -skip-if = true # Bug 1408918
+ [browser_webconsole_autocomplete_and_selfxss.js]
+ subsuite = clipboard
+ skip-if = true #       Bug 1404850
+ # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_autocomplete_crossdomain_iframe.js]
  skip-if = true # Bug 1408919
  [browser_webconsole_autocomplete_in_debugger_stackframe.js]
  skip-if = true # Bug 1408920
- [browser_webconsole_batching.js]
- [browser_webconsole_block_mixedcontent_securityerrors.js]
- tags = mcb
- [browser_webconsole_cached_autocomplete.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_accessibility.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_accessibility.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js

frg/work-js/mozilla-release/patches/1408919-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509629085 -3600
 # Node ID ab8cb0873ccb66992d3fa34d7290125c910aee08
-# Parent  a538dd81a97ce4a0281dd307bc6f7ebed1ac6790
+# Parent  f99f9a4ab00583aef530167b37283c8cb4f2157c
 Bug 1408919 - Rename and enable browser_webconsole_autocomplete_crossdomain_iframe.js; r=Honza.
 
 This bug also renames the support file, and create a dedicated one for the child iframe.
@@ -15,7 +15,7 @@ MozReview-Commit-ID: Gz7zqX825oR
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -89,17 +89,18 @@ support-files =
+@@ -90,17 +90,18 @@ support-files =
    test-bug-782653-css-errors-1.css
    test-bug-782653-css-errors-2.css
    test-bug-782653-css-errors.html
@@ -28,14 +28,14 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 +  test-iframe-child.html
 +  test-iframe-parent.html
    test-certificate-messages.html
-   test-click-function-to-source.html
-   test-click-function-to-source.js
    test-closure-optimized-out.html
    test-closures.html
    test-console-api-stackframe.html
    test-console-clear.html
    test-console-column.html
-@@ -194,16 +195,17 @@ skip-if = true # Bug 1406060
+   test-console-count-external-file.js
+   test-console-count.html
+@@ -193,16 +194,17 @@ skip-if = true # Bug 1406060
  skip-if = true # Bug 1406060
  [browser_console_webconsole_private_browsing.js]
  skip-if = true #       Bug 1403188
@@ -53,15 +53,15 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_autocomplete_return_key.js]
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
-@@ -215,18 +217,16 @@ skip-if = true #       Bug 1403188
- [browser_jsterm_no_input_change_and_tab_key_pressed.js]
- [browser_jsterm_popup_close_on_tab_switch.js]
+@@ -216,18 +218,16 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_popup.js]
  [browser_jsterm_selfxss.js]
  subsuite = clipboard
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 -[browser_webconsole_autocomplete_crossdomain_iframe.js]
 -skip-if = true # Bug 1408919
  [browser_webconsole_autocomplete_in_debugger_stackframe.js]
@@ -69,9 +69,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_cached_messages.js]
- skip-if = true #       Bug 1406069
- [browser_webconsole_cd_iframe.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_autocomplete_crossdomain_iframe.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -171,7 +171,7 @@ rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_j
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -72,50 +72,64 @@ async function openNewTabAndConsole(url,
+@@ -64,50 +64,64 @@ async function openNewTabAndConsole(url,
  
  /**
   * Wait for messages in the web console output, resolving once they are received.

frg/work-js/mozilla-release/patches/1408920-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509702409 -3600
 # Node ID 8823f33351025e25a949160bc23bae9fba9aac5f
-# Parent  14ff22c2001aab9158d47d265e893f57e5475568
+# Parent  9924de769e2faddd54caefa08be0c6f35c3eabda
 Bug 1408920 - Rename and enable browser_webconsole_autocomplete_in_debugger_stackframe.js; r=jdescottes.
 
 We take this as an opportunity to add a jsterm helper function to set its value and
@@ -16,7 +16,7 @@ MozReview-Commit-ID: AKB3CBY8GPv
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -198,16 +198,17 @@ skip-if = true #       Bug 1403188
+@@ -197,16 +197,17 @@ skip-if = true #       Bug 1403188
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_jsterm_accessibility.js]
  [browser_jsterm_add_edited_input_to_history.js]
@@ -34,25 +34,25 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_copy_command.js]
  [browser_jsterm_dollar.js]
  [browser_jsterm_history_persist.js]
-@@ -217,18 +218,16 @@ skip-if = true #       Bug 1403188
- [browser_jsterm_no_input_change_and_tab_key_pressed.js]
- [browser_jsterm_popup_close_on_tab_switch.js]
+@@ -218,18 +219,16 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_popup.js]
  [browser_jsterm_selfxss.js]
  subsuite = clipboard
  [browser_netmonitor_shows_reqs_in_webconsole.js]
  [browser_webconsole_allow_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403452
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 -[browser_webconsole_autocomplete_in_debugger_stackframe.js]
 -skip-if = true # Bug 1408920
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_cached_messages.js]
  skip-if = true #       Bug 1406069
  [browser_webconsole_cd_iframe.js]
- [browser_webconsole_certificate_messages.js]
- skip-if = true # Bug 1408925
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
@@ -414,7 +414,7 @@ rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_j
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -77,17 +77,17 @@ async function openNewTabAndConsole(url,
+@@ -69,17 +69,17 @@ async function openNewTabAndConsole(url,
   *        - hud: the webconsole
   *        - messages: Array[Object]. An array of messages to match.
              Current supported options:
@@ -433,15 +433,17 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
  
            for (let newMessage of newMessages) {
              let messageBody = newMessage.node.querySelector(".message-body");
-@@ -290,16 +290,79 @@ async function checkClickOnNode(hud, too
+@@ -280,8 +280,71 @@ async function checkClickOnNode(hud, too
+ 
+ /**
   * Returns true if the give node is currently focused.
   */
  function hasFocus(node) {
    return node.ownerDocument.activeElement == node
      && node.ownerDocument.hasFocus();
  }
- 
- /**
++
++/**
 + * Set the value of the JsTerm and its caret position, and fire a completion request.
 + *
 + * @param {JsTerm} jsterm
@@ -503,16 +505,6 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
 +  await panel.panelWin.DebuggerController.waitForSourcesLoaded();
 +  return {target, toolbox, panel};
 +}
-+
-+/**
-  * Fake clicking a link and return the URL we would have navigated to.
-  * This function should be used to check external links since we can't access
-  * network in tests.
-  * This can also be used to test that a click will not be fired.
-  *
-  * @param ElementNode element
-  *        The <a> element we want to simulate click on.
-  * @param Object clickEventProps
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html

frg/work-js/mozilla-release/patches/1408921-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508925542 -7200
 # Node ID 92273c4c7222f68e6f2360df34b393f14612f1da
-# Parent  d5d629a2c52a37be5fe20b25776837f080880057
+# Parent  1749057616eff1bd2d4bfdc2b04c643b212a6278
 Bug 1408921 - Split browser_webconsole_autocomplete_keys.js in the new console frontend; r=bgrins.
 
 The test was very long and tested different bugs.
@@ -14,30 +14,31 @@ MozReview-Commit-ID: 4z45RE3eJoC
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -191,16 +191,22 @@ skip-if = true # Bug 1406060
- [browser_console_webconsole_ctrlw_close_tab.js]
+@@ -191,17 +191,23 @@ skip-if = true # Bug 1406060
  skip-if = true # Bug 1406060
  [browser_console_webconsole_iframe_messages.js]
  skip-if = true # Bug 1406060
  [browser_console_webconsole_private_browsing.js]
  skip-if = true #       Bug 1403188
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
+ [browser_jsterm_accessibility.js]
  [browser_jsterm_add_edited_input_to_history.js]
 +[browser_jsterm_autocomplete_array_no_index.js]
 +[browser_jsterm_autocomplete_escape_key.js]
+ [browser_jsterm_autocomplete_helpers.js]
 +[browser_jsterm_autocomplete_inside_text.js]
 +[browser_jsterm_autocomplete_nav_and_tab_key.js]
 +[browser_jsterm_autocomplete_return_key_no_selection.js]
 +[browser_jsterm_autocomplete_return_key.js]
+ [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
- skip-if = true
- subsuite = clipboard
- # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_jsterm_dollar.js]
  [browser_jsterm_history_persist.js]
  [browser_jsterm_inspect.js]
  [browser_jsterm_no_autocompletion_on_defined_variables.js]
-@@ -224,18 +230,16 @@ skip-if = true # Bug 1408918
+ [browser_jsterm_no_input_and_tab_key_pressed.js]
+ [browser_jsterm_no_input_change_and_tab_key_pressed.js]
+@@ -213,18 +219,16 @@ skip-if = true #       Bug 1403452
  [browser_webconsole_autocomplete_and_selfxss.js]
  subsuite = clipboard
  skip-if = true #       Bug 1404850

frg/work-js/mozilla-release/patches/1408922-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509353217 -3600
 # Node ID 95187168788053e9a97cf40157fa904cf1a0fde6
-# Parent  ac4a721b266ba7c686ead2863b12fa4b9d3ab1b1
+# Parent  415b5cd8730d08fedf5ab0507b42ba0b4069c6a9
 Bug 1408922 - Rename and enable browser_webconsole_autocomplete_popup.js in the new console frontend; r=Honza.
 
 MozReview-Commit-ID: A8wZ3MCHgCt
@@ -10,8 +10,8 @@ MozReview-Commit-ID: A8wZ3MCHgCt
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -208,16 +208,17 @@ subsuite = clipboard
- # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
+@@ -207,31 +207,30 @@ skip-if = true #       Bug 1403188
+ [browser_jsterm_copy_command.js]
  [browser_jsterm_dollar.js]
  [browser_jsterm_history_persist.js]
  [browser_jsterm_inspect.js]
@@ -25,10 +25,6 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  tags = mcb
  skip-if = true #       Bug 1403452
  # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_assert.js]
- skip-if = true #       Bug 1403458
- [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
-@@ -229,18 +230,16 @@ skip-if = true # Bug 1408918
  [browser_webconsole_autocomplete_and_selfxss.js]
  subsuite = clipboard
  skip-if = true #       Bug 1404850

frg/work-js/mozilla-release/patches/1408923-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509119711 -7200
 # Node ID a6ea37c77fe08a4bfe80abc5ae4725176379f066
-# Parent  39f523cb4eec50075539c3d6c30b92ba4cb06f56
+# Parent  e557c4a489010bf4c2b9e09927d75c09c85008f8
 Bug 1408923 - Rename and enable browser_webconsole_autocomplete_popup_close_on_tab_switch.js in the new console frontend; r=Honza
 
 MozReview-Commit-ID: EzHtCcJQF8H
@@ -10,9 +10,9 @@ MozReview-Commit-ID: EzHtCcJQF8H
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -207,16 +207,17 @@ skip-if = true
- subsuite = clipboard
- # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
+@@ -206,33 +206,32 @@ skip-if = true #       Bug 1403188
+ [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
+ [browser_jsterm_copy_command.js]
  [browser_jsterm_dollar.js]
  [browser_jsterm_history_persist.js]
  [browser_jsterm_inspect.js]
@@ -25,10 +25,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  tags = mcb
  skip-if = true #       Bug 1403452
  # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_assert.js]
- skip-if = true #       Bug 1403458
- [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
-@@ -230,18 +231,16 @@ subsuite = clipboard
+ [browser_webconsole_autocomplete_and_selfxss.js]
+ subsuite = clipboard
  skip-if = true #       Bug 1404850
  # old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_autocomplete_crossdomain_iframe.js]

frg/work-js/mozilla-release/patches/1408924-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509438026 -3600
 # Node ID 7a2c4ad9108478916f619a0b69c9585d16cb922d
-# Parent  9658f27847dc387d72d36976fbfbdb9d2ad4ece2
+# Parent  284e4f957e0954db3b0e4d820afa6711f42e180a
 Bug 1408924 - Rename and enable browser_webconsole_cached_autocomplete.js in the new console frontend; r=Honza.
 
 MozReview-Commit-ID: GiaKsuxfrKr
@@ -10,7 +10,7 @@ MozReview-Commit-ID: GiaKsuxfrKr
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -193,16 +193,17 @@ skip-if = true # Bug 1406060
+@@ -192,16 +192,17 @@ skip-if = true # Bug 1406060
  [browser_console_webconsole_iframe_messages.js]
  skip-if = true # Bug 1406060
  [browser_console_webconsole_private_browsing.js]
@@ -28,25 +28,25 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_autocomplete_return_key.js]
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
-@@ -221,18 +222,16 @@ subsuite = clipboard
- tags = mcb
- [browser_webconsole_autocomplete_crossdomain_iframe.js]
+@@ -226,18 +227,16 @@ skip-if = true #       Bug 1404850
  skip-if = true # Bug 1408919
  [browser_webconsole_autocomplete_in_debugger_stackframe.js]
  skip-if = true # Bug 1408920
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
 -[browser_webconsole_cached_autocomplete.js]
 -skip-if = true # Bug 1408924
  [browser_webconsole_cached_messages.js]
  skip-if = true #       Bug 1406069
  [browser_webconsole_cd_iframe.js]
+ skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
  skip-if = true # Bug 1408925
  # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
  [browser_webconsole_charset.js]
- skip-if = true #       Bug 1404400
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_autocomplete.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_autocomplete.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js

frg/work-js/mozilla-release/patches/1408926-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510146250 -3600
 # Node ID d94d71ae256f437b75785d899769d561b41d62a4
-# Parent  6ffb73ac5731804e18fe437945743c2a1ee7fc9c
+# Parent  88047aeb37dd0a68e16ac95849fe8541afc9775a
 Bug 1408926 - Rename and enable browser_webconsole_chrome.js in new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: EAoATzKO9bF
@@ -10,7 +10,7 @@ MozReview-Commit-ID: EAoATzKO9bF
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -199,16 +199,17 @@ skip-if = true #       Bug 1403188
+@@ -198,16 +198,17 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_accessibility.js]
  [browser_jsterm_add_edited_input_to_history.js]
  [browser_jsterm_autocomplete_array_no_index.js]
@@ -28,22 +28,22 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
  [browser_jsterm_dollar.js]
-@@ -227,18 +228,16 @@ tags = mcb
- [browser_webconsole_batching.js]
- [browser_webconsole_block_mixedcontent_securityerrors.js]
- tags = mcb
+@@ -231,18 +232,16 @@ tags = mcb
+ skip-if = true #       Bug 1403899
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_cached_messages.js]
  [browser_webconsole_cd_iframe.js]
+ skip-if = true #       Bug 1406030
  [browser_webconsole_certificate_messages.js]
  [browser_webconsole_charset.js]
  skip-if = true #       Bug 1404400
 -[browser_webconsole_chrome.js]
 -skip-if = true # Bug 1408926
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
  skip-if = true # Bug 1408927
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
  [browser_webconsole_completion.js]

frg/work-js/mozilla-release/patches/1408927-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510736096 -3600
 # Node ID b9c6e46ba1cc16167ecaf79693b0334d62d086c6
-# Parent  44262ba21c27c894478729790902741d1bd5c716
+# Parent  2e5dc88e76a61284708de5a81aa9be6d3389e8cc
 Bug 1408927 - Enable browser_webconsole_closing_after_completion.js in the new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: CrudyCnBlWh
@@ -10,17 +10,16 @@ MozReview-Commit-ID: CrudyCnBlWh
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -231,17 +231,16 @@ tags = mcb
- [browser_webconsole_cached_messages.js]
+@@ -232,17 +232,16 @@ tags = mcb
  [browser_webconsole_cd_iframe.js]
  [browser_webconsole_certificate_messages.js]
  [browser_webconsole_charset.js]
  skip-if = true #       Bug 1404400
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
 -skip-if = true # Bug 1408927
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
  [browser_webconsole_completion.js]
@@ -28,6 +27,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_console_api_iframe.js]
  skip-if = true # Bug 1408930
  [browser_webconsole_console_dir.js]
+ [browser_webconsole_console_dir_uninspectable.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js

frg/work-js/mozilla-release/patches/1408928-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510053549 -3600
 # Node ID dfe08f7ae8d9e55f3bf412f437a9afabe72e9589
-# Parent  eb4497bc7d55aded17e5601a65b7a092faf31a03
+# Parent  72debe16cdd40cf11516ca7037d51c8d3a7f5459
 Bug 1408928 - Rename and enable browser_webconsole_closing_brackets.js in new console frontend; r=Honza.
 
 MozReview-Commit-ID: EEwk0mSD5Rs
@@ -10,7 +10,7 @@ MozReview-Commit-ID: EEwk0mSD5Rs
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -197,16 +197,17 @@ skip-if = true # Bug 1406060
+@@ -196,16 +196,17 @@ skip-if = true # Bug 1406060
  skip-if = true #       Bug 1403188
  # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_jsterm_accessibility.js]
@@ -28,18 +28,17 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_autocomplete_return_key.js]
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
-@@ -234,18 +235,16 @@ skip-if = true # Bug 1408925
- [browser_webconsole_charset.js]
+@@ -239,18 +240,16 @@ skip-if = true # Bug 1408925
  skip-if = true #       Bug 1404400
  [browser_webconsole_chrome.js]
  skip-if = true # Bug 1408926
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
  skip-if = true # Bug 1408927
 -[browser_webconsole_closing_brackets.js]
 -skip-if = true # Bug 1408928
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
  [browser_webconsole_completion.js]
@@ -47,6 +46,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_console_api_iframe.js]
  skip-if = true # Bug 1408930
  [browser_webconsole_console_dir.js]
+ [browser_webconsole_console_dir_uninspectable.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_brackets.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_brackets.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js

frg/work-js/mozilla-release/patches/1408929-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1510917284 -3600
 # Node ID 02a2365fd62b825721b3e4161e79f8a19df55b55
-# Parent  26bd0f1be3357f565921a0568a3f7d13ebfd684d
+# Parent  215fcc76ed23ca7d5353af6abd41604f841f1d4a
 Bug 1408929 - Rename and enable browser_webconsole_completion.js in the new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: ICu5aJViiW3
@@ -32,9 +32,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_cd_iframe.js]
  [browser_webconsole_certificate_messages.js]
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
 -[browser_webconsole_completion.js]
@@ -174,7 +174,7 @@ rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_j
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -297,26 +297,50 @@ function hasFocus(node) {
+@@ -294,26 +294,50 @@ function hasFocus(node) {
  /**
   * Set the value of the JsTerm and its caret position, and fire a completion request.
   *

frg/work-js/mozilla-release/patches/1408930-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1511167902 -3600
 # Node ID 7edea0ef408c652b83cce6742ff18a579193b6ab
-# Parent  edd1a4933795a5bcfc3c19a759ad2f7df251db25
+# Parent  b8e9e48fe378473c471efaf994e04e4d4ed47988
 Bug 1408930 - Enable browser_webconsole_console_api_iframe.js in the new console frontend; r=jdescottes.
 
 MozReview-Commit-ID: KGGD7i8WbDZ
@@ -10,7 +10,7 @@ MozReview-Commit-ID: KGGD7i8WbDZ
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -56,17 +56,17 @@ support-files =
+@@ -57,17 +57,17 @@ support-files =
    test-bug-597756-reopen-closed-tab.html
    test-bug-599725-response-headers.sjs
    test-bug-601177-log-levels.html
@@ -32,9 +32,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 @@ -232,17 +232,16 @@ tags = mcb
  [browser_webconsole_certificate_messages.js]
  [browser_webconsole_click_function_to_source.js]
+ skip-if = true #       Bug 1406038
  [browser_webconsole_clickable_urls.js]
  [browser_webconsole_closing_after_completion.js]
- [browser_webconsole_close_sidebar.js]
  [browser_webconsole_closure_inspection.js]
  skip-if = true #       Bug 1405250
  [browser_webconsole_console_api_iframe.js]

frg/work-js/mozilla-release/patches/1408931-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1511340974 -3600
 # Node ID 81a1024cd97a0bf6c50e41bf1c5edb466fc7ce87
-# Parent  62e40b3348181d0b62c4a3bfeda89df8604f9d72
+# Parent  530e4a7f779194ba52c5763a3fe905cd4feeff30
 Bug 1408931 - Enable browser_webconsole_csp_ignore_reflected_xss_message.js in the new console frontend; r=jdescottes.
 
 This also renames the support files.
@@ -12,7 +12,7 @@ MozReview-Commit-ID: 9TqERvD5EFA
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -11,18 +11,18 @@ support-files =
+@@ -10,18 +10,18 @@ support-files =
    source-mapped.css
    source-mapped.css.map
    source-mapped.scss
@@ -32,11 +32,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test_hsts-invalid-headers.sjs
    test-autocomplete-in-stackframe.html
    test-batching.html
-   test-bug_923281_console_log_filter.html
-@@ -252,18 +252,17 @@ skip-if = (os == 'linux' && bits == 32 &
+   test-bug_1050691_click_function_to_source.html
+@@ -251,18 +251,17 @@ subsuite = clipboard
+ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_object.js]
  subsuite = clipboard
- [browser_webconsole_context_menu_object_in_sidebar.js]
  [browser_webconsole_context_menu_open_url.js]
  [browser_webconsole_context_menu_store_as_global.js]
  [browser_webconsole_copy_link_location.js]

frg/work-js/mozilla-release/patches/1408932-59a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1512652271 -3600
 # Node ID 150e5c84fc792f492d17e5527b8ddd3bb44498f6
-# Parent  38a87b0211748ab04526bcb0fd08e994ff8a1095
+# Parent  b61780ab75b5490c7c5d41ae9014ea0599e0220c
 Bug 1408932 - Rename and enable browser_webconsole_cspro.js in new frontend; r=Honza.
 
 MozReview-Commit-ID: 2qSue0CIO1c
@@ -29,7 +29,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test_hpkp-invalid-headers.sjs
    test_hsts-invalid-headers.sjs
    test-autocomplete-in-stackframe.html
-@@ -48,19 +46,16 @@ support-files =
+@@ -50,19 +48,16 @@ support-files =
    test-bug-595934-svg.xhtml
    test-bug-595934-workers.html
    test-bug-595934-workers.js
@@ -49,7 +49,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-bug-658368-time-methods.html
    test-bug-737873-mixedcontent.html
    test-bug-752559-ineffective-iframe-sandbox-warning-inner.html
-@@ -78,16 +73,21 @@ support-files =
+@@ -80,16 +75,21 @@ support-files =
    test-bug-766001-js-console-links.html
    test-bug-766001-js-errors.js
    test-bug-782653-css-errors-1.css
@@ -66,11 +66,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-iframe-child.html
    test-iframe-parent.html
    test-certificate-messages.html
-   test-click-function-to-source.html
-   test-click-function-to-source.js
    test-closure-optimized-out.html
    test-closures.html
    test-console-api-stackframe.html
+   test-console-clear.html
+   test-console-column.html
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js

frg/work-js/mozilla-release/patches/1408933-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1512410155 -3600
 # Node ID b871e0db43a1cbe71e400aa6794bfa13afe7b00c
-# Parent  7160c17138f3797244ae9061f6f364890f95cff5
+# Parent  fad2f60baea164c84c5e6ba9cd72448f344d1dec
 Bug 1408933 - enable and rename browser_webconsole_ctrl_key_nav.js;r=bgrins
 
 Initially tried to port the test to work on all OSes, relying on
@@ -20,7 +20,7 @@ MozReview-Commit-ID: DJbmYzYZUok
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -207,16 +207,18 @@ skip-if = true #       Bug 1403188
+@@ -208,16 +208,18 @@ skip-if = true #       Bug 1403188
  [browser_jsterm_autocomplete_inside_text.js]
  [browser_jsterm_autocomplete_native_getters.js]
  [browser_jsterm_autocomplete_nav_and_tab_key.js]
@@ -39,8 +39,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_multiline.js]
  [browser_jsterm_no_autocompletion_on_defined_variables.js]
  [browser_jsterm_no_input_and_tab_key_pressed.js]
-@@ -259,19 +261,16 @@ subsuite = clipboard
- [browser_webconsole_context_menu_object_in_sidebar.js]
+@@ -260,19 +262,16 @@ skip-if = (os == 'linux' && bits == 32 &
+ subsuite = clipboard
  [browser_webconsole_context_menu_open_url.js]
  [browser_webconsole_context_menu_store_as_global.js]
  [browser_webconsole_csp_ignore_reflected_xss_message.js]

frg/work-js/mozilla-release/patches/1408934-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1512149370 -3600
 # Node ID c888dbc7f5fdd0e859f7bb1d3679e648a303ef5f
-# Parent  9b7e10fe3f51597f8e0a589aece968dfd601b073
+# Parent  33ef38fdf040747e65a881deb314d52c981e7168
 Bug 1408934 - enable browser_webconsole_deactivateHUDForContext_unfocused_window.js;r=Honza
 
 MozReview-Commit-ID: 8k5ISUxEPP7
@@ -10,7 +10,8 @@ MozReview-Commit-ID: 8k5ISUxEPP7
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -231,20 +231,21 @@ tags = mcb
+@@ -230,22 +230,23 @@ subsuite = clipboard
+ tags = mcb
  [browser_webconsole_batching.js]
  [browser_webconsole_block_mixedcontent_securityerrors.js]
  tags = mcb
@@ -18,6 +19,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_cd_iframe.js]
  [browser_webconsole_certificate_messages.js]
  [browser_webconsole_click_function_to_source.js]
+-skip-if = true #       Bug 1406038
++skip-if = true # Bug 1406038
  [browser_webconsole_clickable_urls.js]
 +[browser_webconsole_close_unfocused_window.js]
  [browser_webconsole_closing_after_completion.js]
@@ -34,11 +37,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_console_table.js]
  [browser_webconsole_context_menu_copy_entire_message.js]
 @@ -254,27 +255,25 @@ skip-if = (os == 'linux' && bits == 32 &
+ [browser_webconsole_context_menu_copy_link_location.js]
  subsuite = clipboard
  skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
  [browser_webconsole_context_menu_copy_object.js]
  subsuite = clipboard
- [browser_webconsole_context_menu_object_in_sidebar.js]
  [browser_webconsole_context_menu_open_url.js]
  [browser_webconsole_context_menu_store_as_global.js]
  [browser_webconsole_copy_link_location.js]
@@ -195,14 +198,14 @@ rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_w
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -460,8 +460,27 @@ function simulateLinkClick(element, clic
+@@ -428,8 +428,27 @@ function simulateLinkClick(element) {
+       window.openUILinkIn = oldOpenUILinkIn;
+       resolve(link);
+     };
  
-   onOpenLink.then(() => {
-     if (timeoutId) {
-       clearTimeout(timeoutId);
-     }
+     // Click on the link.
+     element.click();
    });
-   return Promise.race([onOpenLink, onTimeout]);
  }
 +
 +/**

frg/work-js/mozilla-release/patches/1408938-59a1.patch

@@ -2,7 +2,7 @@
 # User Patrick Brosset <pbrosset@mozilla.com>
 # Date 1511541512 -3600
 # Node ID 067659e3751f412350c514256689bc2253d6d7da
-# Parent  738625dbd25168e6fe9281ef3ccbe4b739995e08
+# Parent  8f286a169ed034274c4ea7f9ff47d8188ff9f565
 Bug 1408938 - Enable and rename browser_webconsole_history.js; r=nchevobbe
 
 MozReview-Commit-ID: GU4Z3ghCTmv
@@ -28,7 +28,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_popup_close_on_tab_switch.js]
  [browser_jsterm_popup.js]
  [browser_jsterm_selfxss.js]
-@@ -286,18 +287,16 @@ skip-if = true # Bug 1408937
+@@ -285,18 +286,16 @@ skip-if = true # Bug 1408937
  skip-if = true #       Bug 1404382
  [browser_webconsole_filter_scroll.js]
  skip-if = true #       Bug 1404392
@@ -44,9 +44,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_history_nav.js]
  skip-if = true # Bug 1408940
  [browser_webconsole_hpkp_invalid-headers.js]
+ skip-if = true #       Bug 1405340
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_hsts_invalid-headers.js]
- [browser_webconsole_iframe_wrong_hud.js]
- skip-if = true #       Bug 1404378
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js

frg/work-js/mozilla-release/patches/1408939-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1512146562 -3600
 # Node ID 002f87c4339207515da014fe01440da99d8f63cb
-# Parent  dad6f4e2509496abf42aa3a6358bea6f0a2fe526
+# Parent  17aa8bc627098cf16d7e075ce37b1b959f2b4fbc
 Bug 1408939 - enable browser_webconsole_history_arrow_keys.js;r=Honza
 
 MozReview-Commit-ID: KvBrFRMW0W1
@@ -21,13 +21,13 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_history_arrow_keys.js]
 -skip-if = true # Bug 1408939
  [browser_webconsole_hpkp_invalid-headers.js]
+ skip-if = true #       Bug 1405340
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_hsts_invalid-headers.js]
+ skip-if = true #       Bug 1405341
+ # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_webconsole_iframe_wrong_hud.js]
  skip-if = true #       Bug 1404378
- [browser_webconsole_ineffective_iframe_sandbox_warning.js]
- skip-if = true #       Bug 1404883
- # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_init.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js

frg/work-js/mozilla-release/patches/1408940-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1512145181 -3600
 # Node ID 581fec9ba4f2d02f9ec416c1c2c3eaa3b748e003
-# Parent  cbe5934f7235292af1f4d4792caf2b28999b9824
+# Parent  8fb082bd6cccd4596c0379f6090f9a36b3120595
 Bug 1408940 - enable browser_webconsole_history_nav.js;r=nchevobbe
 
 MozReview-Commit-ID: LCLeM9cj7TX
@@ -40,13 +40,13 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 -[browser_webconsole_history_nav.js]
 -skip-if = true # Bug 1408940
  [browser_webconsole_hpkp_invalid-headers.js]
+ skip-if = true #       Bug 1405340
+ # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
  [browser_webconsole_hsts_invalid-headers.js]
+ skip-if = true #       Bug 1405341
+ # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
  [browser_webconsole_iframe_wrong_hud.js]
  skip-if = true #       Bug 1404378
- [browser_webconsole_ineffective_iframe_sandbox_warning.js]
- skip-if = true #       Bug 1404883
- # old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
- [browser_webconsole_init.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
 rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_nav.js
 rename to devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js

frg/work-js/mozilla-release/patches/1408942-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511904857 -3600
 # Node ID e5e690295e32c7704e1cc1494dbb28a7319be4a3
-# Parent  6a661e6c7dcc7cb4925dfaa110439372d377a3a7
+# Parent  4a38f244a5682afd0010c0acf7e7623337ac4e86
 Bug 1408942 - Enable browser_webconsole_multiple_windows_and_tabs.js;r=Honza
 
 MozReview-Commit-ID: 5AqqgKLvN7
@@ -10,7 +10,7 @@ MozReview-Commit-ID: 5AqqgKLvN7
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -338,17 +338,16 @@ skip-if = true #       Bug 1403448
+@@ -342,17 +342,16 @@ skip-if = true #       Bug 1403448
  skip-if = true #       Bug 1403448
  [browser_webconsole_message_categories.js]
  skip-if = true #       Bug 1404384
@@ -26,8 +26,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_network_exceptions.js]
  [browser_webconsole_network_messages_expand.js]
  [browser_webconsole_network_messages_openinnet.js]
- [browser_webconsole_network_messages_status_code.js]
  [browser_webconsole_network_requests_from_chrome.js]
+ [browser_webconsole_nodes_highlight.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js

frg/work-js/mozilla-release/patches/1408943-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511457619 -3600
 # Node ID b032f58dc991b0bdb5da27ef3a8fcb6afe256b50
-# Parent  2bda258bcf7426538ecb5878c54768ebf7cfabc9
+# Parent  28516feeafacbf9a83ea1cc16b48ef383e5f43c5
 Bug 1408943 - enable browser_webconsole_network_exceptions.js;r=nchevobbe
 
 MozReview-Commit-ID: 7Jb2y9AQ4fa
@@ -10,7 +10,7 @@ MozReview-Commit-ID: 7Jb2y9AQ4fa
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -56,17 +56,16 @@ support-files =
+@@ -57,17 +57,16 @@ support-files =
    test-bug-599725-response-headers.sjs
    test-bug-601177-log-levels.html
    test-bug-601177-log-levels.js
@@ -28,7 +28,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-bug-658368-time-methods.html
    test-bug-737873-mixedcontent.html
    test-bug-752559-ineffective-iframe-sandbox-warning-inner.html
-@@ -141,16 +140,17 @@ support-files =
+@@ -140,16 +139,17 @@ support-files =
    test-location-debugger-link-console-log.js
    test-location-debugger-link-errors.js
    test-location-debugger-link.html
@@ -46,7 +46,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-reopen-closed-tab.html
    test-repeated-messages.html
    test-result-format-as-string.html
-@@ -345,17 +345,16 @@ skip-if = true #       Bug 1404886
+@@ -348,17 +348,16 @@ skip-if = true #       Bug 1404886
  [browser_webconsole_multiline_input.js]
  skip-if = true # Bug 1408941
  [browser_webconsole_multiple_windows_and_tabs.js]
@@ -58,12 +58,12 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 -skip-if = true # Bug 1408943
  [browser_webconsole_network_messages_expand.js]
  [browser_webconsole_network_messages_openinnet.js]
- [browser_webconsole_network_messages_status_code.js]
  [browser_webconsole_network_requests_from_chrome.js]
  [browser_webconsole_nodes_highlight.js]
  [browser_webconsole_nodes_select.js]
  [browser_webconsole_notifications.js]
  skip-if = true #       Bug 1405637
+ [browser_webconsole_object_inspector.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js

frg/work-js/mozilla-release/patches/1408944-59a1.patch

@@ -2,7 +2,7 @@
 # User Patrick Brosset <pbrosset@mozilla.com>
 # Date 1511363763 -3600
 # Node ID 01298c757565d7277b81c396e873d7f8fb07cc42
-# Parent  ef59e3d5d0fd9da6b97019bc18e2ee87474747e9
+# Parent  fc979daa3c1fa922c135c34b8c7d4e796f80bdc2
 Bug 1408944 - Rewrite and enable browser_webconsole_network_requests_from_chrome.js; r=nchevobbe
 
 MozReview-Commit-ID: EPzTQhqhVFE
@@ -10,24 +10,24 @@ MozReview-Commit-ID: EPzTQhqhVFE
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -353,17 +353,16 @@ skip-if = true # Bug 1408942
+@@ -355,17 +355,16 @@ skip-if = true # Bug 1408942
+ [browser_webconsole_netlogging_reset_filter.js]
  skip-if = true #       Bug 1405636
  [browser_webconsole_network_attach.js]
  [browser_webconsole_network_exceptions.js]
  skip-if = true # Bug 1408943
  [browser_webconsole_network_messages_expand.js]
  [browser_webconsole_network_messages_openinnet.js]
- [browser_webconsole_network_messages_status_code.js]
  [browser_webconsole_network_requests_from_chrome.js]
 -skip-if = true # Bug 1408944
  [browser_webconsole_nodes_highlight.js]
  [browser_webconsole_nodes_select.js]
  [browser_webconsole_notifications.js]
  skip-if = true #       Bug 1405637
- [browser_webconsole_object_in_sidebar.js]
  [browser_webconsole_object_inspector.js]
  [browser_webconsole_object_inspector_entries.js]
  [browser_webconsole_observer_notifications.js]
+ [browser_webconsole_optimized_out_vars.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js

frg/work-js/mozilla-release/patches/1408945-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511455061 -3600
 # Node ID 7ef48daab640e292d0bb3b98eed36175335778a2
-# Parent  392676858ac5749784cd69f976ed8a0dacd57ba6
+# Parent  50c3440d43d50f907e1998bf9127e723bfb9db91
 Bug 1408945 - enable browser_webconsole_optimized_out_vars.js;r=nchevobbe
 
 MozReview-Commit-ID: CNPdSwF6kbc
@@ -10,11 +10,11 @@ MozReview-Commit-ID: CNPdSwF6kbc
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -359,17 +359,16 @@ skip-if = true # Bug 1408943
+@@ -360,17 +360,16 @@ skip-if = true # Bug 1408943
+ [browser_webconsole_nodes_highlight.js]
  [browser_webconsole_nodes_select.js]
  [browser_webconsole_notifications.js]
  skip-if = true #       Bug 1405637
- [browser_webconsole_object_in_sidebar.js]
  [browser_webconsole_object_inspector.js]
  [browser_webconsole_object_inspector_entries.js]
  [browser_webconsole_observer_notifications.js]

frg/work-js/mozilla-release/patches/1408947-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511450509 -3600
 # Node ID bac113bafbdfd44e3440b2ec44328810eb9889bb
-# Parent  c48027ccdb60de76d27735ccb8a24f79399267fe
+# Parent  3bc4190076c7c9af39f1dd0e69b893750dcee08c
 Bug 1408947 - enable browser_webconsole_reopen_closed_tab.js in the new console frontend;r=nchevobbe
 
 MozReview-Commit-ID: KNcfZ4FqVET
@@ -10,7 +10,7 @@ MozReview-Commit-ID: KNcfZ4FqVET
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -48,17 +48,16 @@ support-files =
+@@ -49,17 +49,16 @@ support-files =
    test-bug-595934-malformedxml-external.html
    test-bug-595934-malformedxml-external.xml
    test-bug-595934-malformedxml.xhtml
@@ -28,7 +28,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-cd-iframe-child.html
    test-cd-iframe-parent.html
    test-console-api-iframe.html
-@@ -147,16 +146,17 @@ support-files =
+@@ -146,16 +145,17 @@ support-files =
    test-location-styleeditor-link.html
    test-mixedcontent-securityerrors.html
    test-mutation.html
@@ -46,7 +46,7 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test-sourcemap-error-02.js
    test-stacktrace-location-debugger-link.html
    test-trackingprotection-securityerrors.html
-@@ -381,17 +381,16 @@ skip-if = true # Bug 1408946
+@@ -382,17 +382,16 @@ skip-if = true # Bug 1408946
  [browser_webconsole_property_provider.js]
  skip-if = true # Bug 1406841
  #old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
@@ -61,9 +61,9 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_webconsole_repeated_messages_accuracy.js]
  skip-if = true #       Bug 1403450
  [browser_webconsole_sandbox_update_after_navigation.js]
+ skip-if = true #       Bug 1401942
  [browser_webconsole_script_errordoc_urls.js]
  skip-if = true #       Bug 1403454
- # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
@@ -179,13 +179,13 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -392,16 +392,33 @@ async function openDebugger(options = {}
+@@ -389,16 +389,33 @@ async function openDebugger(options = {}
   */
  async function openConsole(tab) {
    let target = TargetFactory.forTab(tab || gBrowser.selectedTab);
    const toolbox = await gDevTools.showToolbox(target, "webconsole");
    return toolbox.getCurrentPanel().hud;
- };
+ }
  
  /**
 + * Close the Web Console for the given tab.
@@ -208,11 +208,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.j
   * Fake clicking a link and return the URL we would have navigated to.
   * This function should be used to check external links since we can't access
   * network in tests.
-  * This can also be used to test that a click will not be fired.
   *
   * @param ElementNode element
   *        The <a> element we want to simulate click on.
-  * @param Object clickEventProps
+  * @returns Promise
+  *          A Promise that resolved when the link clik simulation occured.
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597756-reopen-closed-tab.html b/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html
 rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-597756-reopen-closed-tab.html
 rename to devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html

frg/work-js/mozilla-release/patches/1408948-59a1.patch

@@ -2,7 +2,7 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1511445339 -3600
 # Node ID b34741ad09ba0c73e982bffd7d88d36bd92dac42
-# Parent  2fd6cc209c6dcd7312a3af6eb52377994da20742
+# Parent  159e229edc3e063a40ab9dc12ba32f9abb6dfb65
 Bug 1408948 - enable browser_webconsole_show_subresource_security_errors.js;r=nchevobbe
 
 MozReview-Commit-ID: Dci3py85zJq
@@ -10,7 +10,7 @@ MozReview-Commit-ID: Dci3py85zJq
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -13,19 +13,16 @@ support-files =
+@@ -12,19 +12,16 @@ support-files =
    source-mapped.scss
    test_bug_1010953_cspro.html
    test_bug_1010953_cspro.html^headers^
@@ -26,11 +26,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    test_hsts-invalid-headers.sjs
    test-autocomplete-in-stackframe.html
    test-batching.html
+   test-bug_1050691_click_function_to_source.html
+   test-bug_1050691_click_function_to_source.js
    test-bug_923281_console_log_filter.html
    test-bug_923281_test1.js
-   test-bug_923281_test2.js
-   test-bug_939783_console_trace_duplicates.html
-@@ -154,16 +151,19 @@ support-files =
+@@ -153,16 +150,19 @@ support-files =
    test-reopen-closed-tab.html
    test-repeated-messages.html
    test-result-format-as-string.html
@@ -47,11 +47,11 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    testscript.js
    !/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
    !/image/test/mochitest/blue.png
-   !/devtools/client/shared/test/shared-head.js
+   !/devtools/client/framework/test/shared-head.js
+   !/devtools/client/netmonitor/test/shared-head.js
  [browser_console.js]
- skip-if = true # Bug 1406060
-@@ -388,18 +388,16 @@ skip-if = true #       Bug 1403450
- [browser_webconsole_sandbox_update_after_navigation.js]
+@@ -390,18 +390,16 @@ skip-if = true #       Bug 1403450
+ skip-if = true #       Bug 1401942
  [browser_webconsole_script_errordoc_urls.js]
  skip-if = true #       Bug 1403454
  # old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s

frg/work-js/mozilla-release/patches/1408949-2-59a1.patch

@@ -2,7 +2,7 @@
 # User Brian Grinstead <bgrinstead@mozilla.com>
 # Date 1512153382 28800
 # Node ID 7c8899de7eddf54fec01c29888766e82a4acea5d
-# Parent  8f89e09f66af30c6ef56e99621c32addd060e055
+# Parent  3173462c1a100ae08164b25816b6a6441369de87
 Bug 1408949 - Remove unnecessary clearing of devtools.toolbox.splitconsoleEnabled;r=Honza
 
 This is already cleared in shared-head.js
@@ -71,7 +71,7 @@ diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_split-console-p
 diff --git a/devtools/client/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
 --- a/devtools/client/debugger/test/mochitest/head.js
 +++ b/devtools/client/debugger/test/mochitest/head.js
-@@ -1220,20 +1220,16 @@ function source(sourceClient) {
+@@ -1217,20 +1217,16 @@ function source(sourceClient) {
    info("Getting source.\n");
    return sourceClient.source();
  }
@@ -162,11 +162,11 @@ diff --git a/devtools/client/storage/test/head.js b/devtools/client/storage/test
 --- a/devtools/client/storage/test/head.js
 +++ b/devtools/client/storage/test/head.js
 @@ -8,17 +8,16 @@
- /* import-globals-from ../../shared/test/shared-head.js */
+ /* import-globals-from ../../framework/test/shared-head.js */
  
  // shared-head.js handles imports, constants, and utility functions
  Services.scriptloader.loadSubScript(
-   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
+   "chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
    this);
  
  const {TableWidget} = require("devtools/client/shared/widgets/TableWidget");

frg/work-js/mozilla-release/patches/1408949-3-59a1.patch

@@ -2,15 +2,15 @@
 # User Brian Grinstead <bgrinstead@mozilla.com>
 # Date 1512153385 28800
 # Node ID 52fbbe9e0b84304bf9115e0404c543f89ec1ff1e
-# Parent  2e336bb0c6137dbb4a0ec7a6b782f255520e9758
+# Parent  ad6a3740aa429c3e4fe72991b09c612353d9cd50
 Bug 1408949 - Always clear splitconsole height pref after each test;r=Honza
 
 MozReview-Commit-ID: 8BxwRp19U9l
 
-diff --git a/devtools/client/shared/test/shared-head.js b/devtools/client/shared/test/shared-head.js
---- a/devtools/client/shared/test/shared-head.js
-+++ b/devtools/client/shared/test/shared-head.js
-@@ -127,16 +127,17 @@ function loadFrameScriptUtils(browser = 
+diff --git a/devtools/client/framework/test/shared-head.js b/devtools/client/framework/test/shared-head.js
+--- a/devtools/client/framework/test/shared-head.js
++++ b/devtools/client/framework/test/shared-head.js
+@@ -126,16 +126,17 @@ function getFrameScript() {
  
  flags.testing = true;
  registerCleanupFunction(() => {

frg/work-js/mozilla-release/patches/1408950-59a1.patch

@@ -2,7 +2,7 @@
 # User Mike Park <mikeparkms@gmail.com>
 # Date 1511292323 18000
 # Node ID 9b7b27dd0cefc6c9539966127eec2a91610a5c7d
-# Parent  2d990245d74ee216ac1c24e7bb2c94374d0062c6
+# Parent  c7610d6c3539b9dce8f3877fd756b9f3d491e696
 Bug 1408950 - Enable browser_webconsole_websocket.js in the new console frontend. r=nchevobbe
 
 MozReview-Commit-ID: K0wKsAPmXxP
@@ -43,12 +43,12 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
    testscript.js
    !/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
    !/image/test/mochitest/blue.png
-   !/devtools/client/shared/test/shared-head.js
+   !/devtools/client/framework/test/shared-head.js
  [browser_console.js]
  skip-if = true # Bug 1406060
  [browser_console_addonsdk_loader_exception.js]
  skip-if = true # Bug 1406060
-@@ -408,9 +408,8 @@ skip-if = true #       Bug 1403200
+@@ -411,9 +411,8 @@ skip-if = true #       Bug 1403200
  skip-if = true #       Bug 1403205
  [browser_webconsole_view_source.js]
  [browser_webconsole_violation.js]

frg/work-js/mozilla-release/patches/1409672-60a1.patch

@@ -2,7 +2,7 @@
 # User Emilio Cobos Alvarez <emilio@crisal.io>
 # Date 1516112079 -3600
 # Node ID eafefacbfaf926a479848e95e5b28d65f19af12f
-# Parent  3ae7e5e0a7aef4a112965bdaebfa097411e6217f
+# Parent  869d8257d00150600658d791ef5d6af32b413410
 Bug 1409672: Handle document state changes using the invalidation machinery. r=xidorn
 
 MozReview-Commit-ID: EoSMrYPS7dl
@@ -10,7 +10,7 @@ MozReview-Commit-ID: EoSMrYPS7dl
 diff --git a/dom/xbl/nsBindingManager.cpp b/dom/xbl/nsBindingManager.cpp
 --- a/dom/xbl/nsBindingManager.cpp
 +++ b/dom/xbl/nsBindingManager.cpp
-@@ -1170,25 +1170,8 @@ nsBindingManager::FindNestedSingleInsert
+@@ -1132,25 +1132,8 @@ nsBindingManager::FindNestedSingleInsert
      if (newParent == parent) {
        break;
      }
@@ -39,13 +39,13 @@ diff --git a/dom/xbl/nsBindingManager.cpp b/dom/xbl/nsBindingManager.cpp
 diff --git a/dom/xbl/nsBindingManager.h b/dom/xbl/nsBindingManager.h
 --- a/dom/xbl/nsBindingManager.h
 +++ b/dom/xbl/nsBindingManager.h
-@@ -171,17 +171,21 @@ public:
+@@ -168,17 +168,21 @@ public:
+   // points and their insertion parents.
+   void ClearInsertionPointsRecursively(nsIContent* aContent);
+ 
    // Called when the document is going away
    void DropDocumentReference();
  
-   nsIContent* FindNestedInsertionPoint(nsIContent* aContainer,
-                                        nsIContent* aChild);
- 
    nsIContent* FindNestedSingleInsertionPoint(nsIContent* aContainer, bool* aMulti);
  
 -  bool AnyBindingHasDocumentStateDependency(mozilla::EventStates aStateMask);
@@ -62,7 +62,7 @@ diff --git a/dom/xbl/nsBindingManager.h b/dom/xbl/nsBindingManager.h
    // Called by ContentAppended and ContentInserted to handle a single child
    // insertion.  aChild must not be null.  aContainer may be null.
    // aAppend is true if this child is being appended, not inserted.
-@@ -193,24 +197,17 @@ protected:
+@@ -190,24 +194,17 @@ protected:
    void DoProcessAttachedQueue();
  
    // Post an event to process the attached queue.
@@ -90,7 +90,7 @@ diff --git a/dom/xbl/nsBindingManager.h b/dom/xbl/nsBindingManager.h
 diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
 --- a/layout/base/PresShell.cpp
 +++ b/layout/base/PresShell.cpp
-@@ -4296,45 +4296,40 @@ PresShell::ContentStateChanged(nsIDocume
+@@ -4268,45 +4268,40 @@ PresShell::ContentStateChanged(nsIDocume
    if (mDidInitialize) {
      nsAutoCauseReflowNotifier crNotifier(this);
      mPresContext->RestyleManager()->ContentStateChanged(aContent, aStateMask);

frg/work-js/mozilla-release/patches/1410351-59a1.patch

@@ -2,7 +2,7 @@
 # User Jan Odvarko <odvarko@gmail.com>
 # Date 1510232519 -3600
 # Node ID c7416b8613b6e48f2b74caef5f0681c02cdcf2ed
-# Parent  175f7f7e826ac84600aabd9c0389ae75adefee47
+# Parent  2e5a1cbd56d827de3628e9a4c77eb5ecdee33201
 Bug 1410351 - Make it more obvious when requests are paused in the netmonitor; r=rickychien
 
 MozReview-Commit-ID: FlHVxePSbqg
@@ -38,15 +38,15 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
      content/shared/theme-switching.js (shared/theme-switching.js)
      content/shared/frame-script-utils.js (shared/frame-script-utils.js)
      content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul)
-@@ -312,8 +302,21 @@ devtools.jar:
-     skin/images/firebug/command-frames.svg (themes/images/firebug/command-frames.svg)
-     skin/images/firebug/command-paintflashing.svg (themes/images/firebug/command-paintflashing.svg)
-     skin/images/firebug/command-responsivemode.svg (themes/images/firebug/command-responsivemode.svg)
-     skin/images/firebug/command-scratchpad.svg (themes/images/firebug/command-scratchpad.svg)
-     skin/images/firebug/command-screenshot.svg (themes/images/firebug/command-screenshot.svg)
-     skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
-     skin/images/firebug/command-rulers.svg (themes/images/firebug/command-rulers.svg)
-     skin/images/firebug/command-noautohide.svg (themes/images/firebug/command-noautohide.svg)
+@@ -313,8 +303,21 @@ devtools.jar:
+     skin/images/debugger/folder.svg (themes/images/debugger/folder.svg)
+     skin/images/debugger/pause-exceptions.svg (themes/images/debugger/pause-exceptions.svg)
+     skin/images/debugger/pause.svg (themes/images/debugger/pause.svg)
+     skin/images/debugger/prettyPrint.svg (themes/images/debugger/prettyPrint.svg)
+     skin/images/debugger/resume.svg (themes/images/debugger/resume.svg)
+     skin/images/debugger/stepIn.svg (themes/images/debugger/stepIn.svg)
+     skin/images/debugger/stepOut.svg (themes/images/debugger/stepOut.svg)
+     skin/images/debugger/stepOver.svg (themes/images/debugger/stepOver.svg)
 +
 +    # Netmonitor
 +    content/netmonitor/src/assets/styles/httpi.css (netmonitor/src/assets/styles/httpi.css)

frg/work-js/mozilla-release/patches/1411502-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1508918447 -7200
 # Node ID 1b655a076c997999e68810ac707427b5adb4420c
-# Parent  60777943a540fc1c52aa5fc2fe0cba20e6353e6a
+# Parent  750934ffe48311ab1aa7463f52ba3847ed0ddcc3
 Bug 1411502 - Enable browser_jsterm_copy_command.js in new frontend; r=Honza.
 
 MozReview-Commit-ID: EsQsov5y7cD
@@ -10,13 +10,13 @@ MozReview-Commit-ID: EsQsov5y7cD
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
-@@ -201,19 +201,16 @@ skip-if = true #       Bug 1403188
- [browser_jsterm_autocomplete_escape_key.js]
+@@ -194,19 +194,16 @@ skip-if = true # Bug 1406060
+ skip-if = true # Bug 1406060
+ [browser_console_webconsole_private_browsing.js]
+ skip-if = true #       Bug 1403188
+ # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
+ [browser_jsterm_add_edited_input_to_history.js]
  [browser_jsterm_autocomplete_helpers.js]
- [browser_jsterm_autocomplete_inside_text.js]
- [browser_jsterm_autocomplete_nav_and_tab_key.js]
- [browser_jsterm_autocomplete_return_key_no_selection.js]
- [browser_jsterm_autocomplete_return_key.js]
  [browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js]
  [browser_jsterm_copy_command.js]
 -skip-if = true
@@ -28,8 +28,8 @@ diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browse
  [browser_jsterm_no_autocompletion_on_defined_variables.js]
  [browser_jsterm_no_input_and_tab_key_pressed.js]
  [browser_jsterm_no_input_change_and_tab_key_pressed.js]
- [browser_jsterm_popup_close_on_tab_switch.js]
- [browser_jsterm_popup.js]
+ [browser_netmonitor_shows_reqs_in_webconsole.js]
+ [browser_webconsole_allow_mixedcontent_securityerrors.js]
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js

frg/work-js/mozilla-release/patches/1411727-58a1.patch

@@ -2,7 +2,7 @@
 # User Jason Laster <jason.laster.11@gmail.com>
 # Date 1509469501 -3600
 # Node ID 129dfaaf265a5eb9b18681fded2c3910167ddcff
-# Parent  34d85ca8f714c54a56fd5bf10f85b68b650e36d4
+# Parent  feece6126104d7acd73b15ad382cd7213246a174
 Bug 1411727 - Update Debugger frontend (10-25). r=jdescottes
 
 MozReview-Commit-ID: BffE9lchnEj
@@ -7880,7 +7880,7 @@ diff --git a/devtools/client/debugger/new/search-worker.js b/devtools/client/deb
 diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini
 --- a/devtools/client/debugger/new/test/mochitest/browser.ini
 +++ b/devtools/client/debugger/new/test/mochitest/browser.ini
-@@ -82,34 +82,33 @@ skip-if = debug # bug 1374187
+@@ -80,34 +80,33 @@ skip-if = debug # bug 1374187
  [browser_dbg-editor-select.js]
  [browser_dbg-editor-highlight.js]
  [browser_dbg-expressions.js]
@@ -8824,7 +8824,7 @@ diff --git a/devtools/client/debugger/new/test/mochitest/head.js b/devtools/clie
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -293,17 +293,26 @@ devtools.jar:
+@@ -296,9 +296,18 @@ devtools.jar:
      skin/images/firebug/command-screenshot.svg (themes/images/firebug/command-screenshot.svg)
      skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
      skin/images/firebug/command-rulers.svg (themes/images/firebug/command-rulers.svg)
@@ -8843,14 +8843,6 @@ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
 +    skin/images/debugger/stepIn.svg (themes/images/debugger/stepIn.svg)
 +    skin/images/debugger/stepOut.svg (themes/images/debugger/stepOut.svg)
 +    skin/images/debugger/stepOver.svg (themes/images/debugger/stepOver.svg)
- 
-     # Netmonitor
-     content/netmonitor/src/assets/styles/httpi.css (netmonitor/src/assets/styles/httpi.css)
-     content/netmonitor/src/assets/styles/MdnLink.css (netmonitor/src/assets/styles/MdnLink.css)
-     content/netmonitor/src/assets/styles/netmonitor.css (netmonitor/src/assets/styles/netmonitor.css)
-     content/netmonitor/src/assets/styles/NetworkDetailsPanel.css (netmonitor/src/assets/styles/NetworkDetailsPanel.css)
-     content/netmonitor/src/assets/styles/RequestList.css (netmonitor/src/assets/styles/RequestList.css)
-     content/netmonitor/src/assets/styles/StatisticsPanel.css (netmonitor/src/assets/styles/StatisticsPanel.css)
 diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties
 --- a/devtools/client/locales/en-US/debugger.properties
 +++ b/devtools/client/locales/en-US/debugger.properties

frg/work-js/mozilla-release/patches/1412029-1only-58a1.patch

@@ -2,15 +2,15 @@
 # User Julian Descottes <jdescottes@mozilla.com>
 # Date 1509544051 -3600
 # Node ID b8fc199eb8a48233ba82c35498c8ccdde8987196
-# Parent  0580744fd876f1f331394558c56f974e555a5972
+# Parent  51db3740bec0a93ef34376141fd9061092cbc94e
 Bug 1412029 - pass key shortcut id to aboutdevtools page;r=bgrins
 
 MozReview-Commit-ID: 4Fmj1p1bgsB
 
-diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-startup.js
---- a/devtools/startup/devtools-startup.js
-+++ b/devtools/startup/devtools-startup.js
-@@ -453,19 +453,21 @@ DevToolsStartup.prototype = {
+diff --git a/devtools/shim/devtools-startup.js b/devtools/shim/devtools-startup.js
+--- a/devtools/shim/devtools-startup.js
++++ b/devtools/shim/devtools-startup.js
+@@ -459,19 +459,21 @@ DevToolsStartup.prototype = {
      // Appending a <key> element is not always enough. The <keyset> needs
      // to be detached and reattached to make sure the <key> is taken into
      // account (see bug 832984).
@@ -35,7 +35,7 @@ diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-st
    // Create a <xul:key> DOM Element
    createKey(doc, { id, toolId, shortcut, modifiers: mod }, oncommand) {
      let k = doc.createElement("key");
-@@ -511,17 +513,27 @@ DevToolsStartup.prototype = {
+@@ -517,17 +519,27 @@ DevToolsStartup.prototype = {
      this.initialized = true;
      let { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
      // Ensure loading main devtools module that hooks up into browser UI
@@ -64,7 +64,7 @@ diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-st
        // browser.documentURI might be undefined if the browser tab is still loading.
        let location = browser.documentURI ? browser.documentURI.spec : "";
        if (location.startsWith("about:devtools") &&
-@@ -539,16 +551,20 @@ DevToolsStartup.prototype = {
+@@ -545,16 +557,20 @@ DevToolsStartup.prototype = {
        params.push("reason=" + encodeURIComponent(reason));
      }
  

frg/work-js/mozilla-release/patches/1412049-58a1.patch

@@ -2,7 +2,7 @@
 # User Nicolas Chevobbe <nchevobbe@mozilla.com>
 # Date 1509112969 -7200
 # Node ID 9ae8421bb15bf3f0571d824f1061b2ebf7b14818
-# Parent  ba177e99dfb4f00d16b0d5540b0ae1181f42ecc3
+# Parent  d2750c3324f5d40a6d35655c9ddf5adad8033d48
 Bug 1412049 - Clear filterbar visible prefs between tests; r=Honza.
 
 This was making browser_webconsole_filters.js fail on verify mode, and
@@ -13,11 +13,11 @@ MozReview-Commit-ID: 9syLDYAjm6S
 diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 --- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
 +++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
-@@ -24,16 +24,17 @@ const STATUS_CODES_GA_PARAMS = `?${new U
-   "utm_source": "mozilla",
-   "utm_medium": "devtools-webconsole",
-   "utm_campaign": "default"
- })}`;
+@@ -16,16 +16,17 @@ Services.scriptloader.loadSubScript(
+   this);
+ 
+ var {HUDService} = require("devtools/client/webconsole/hudservice");
+ var WCUL10n = require("devtools/client/webconsole/webconsole-l10n");
  
  Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
  registerCleanupFunction(function* () {