Merge inbound to mozilla-central. a=merge

Author: nbeleuzu

.eslintignore

@@ -106,7 +106,7 @@ devtools/client/webreplay/mochitest/examples/*.html
 devtools/client/debugger/**
 
 # Ignore devtools imported repositories
-devtools/client/debugger/new/**
+devtools/client/debugger/**
 devtools/client/shared/components/reps/**
 
 # Ignore devtools preferences files

.gitignore

@@ -89,8 +89,8 @@ devtools/client/chrome.manifest
 devtools/shared/chrome.manifest
 
 # Ignore debugger build directories
-devtools/client/debugger/new/assets/build
-devtools/client/debugger/new/assets/module-manifest.json
+devtools/client/debugger/assets/build
+devtools/client/debugger/assets/module-manifest.json
 
 # Ignore node_modules directories in devtools
 devtools/**/node_modules

browser/base/content/test/static/browser_parsable_css.js

@@ -14,9 +14,9 @@ let whitelist = [
   {sourceName: /codemirror\.css$/i,
    isFromDevTools: true},
   // The debugger uses cross-browser CSS.
-  {sourceName: /devtools\/client\/debugger\/new\/dist\/vendors.css/i,
+  {sourceName: /devtools\/client\/debugger\/dist\/vendors.css/i,
    isFromDevTools: true},
-  {sourceName: /devtools\/client\/debugger\/new\/src\/components\/([A-z\/]+).css/i,
+  {sourceName: /devtools\/client\/debugger\/src\/components\/([A-z\/]+).css/i,
   isFromDevTools: true},
    // Reps uses cross-browser CSS.
    {sourceName: /devtools-client-shared\/components\/reps\/reps.css/i,

devtools/client/application/test/browser.ini

@@ -12,8 +12,8 @@ support-files =
   service-workers/scope-page.html
   service-workers/simple.html
   service-workers/simple-unicode.html
-  !/devtools/client/debugger/new/test/mochitest/helpers.js
-  !/devtools/client/debugger/new/test/mochitest/helpers/context.js
+  !/devtools/client/debugger/test/mochitest/helpers.js
+  !/devtools/client/debugger/test/mochitest/helpers/context.js
   !/devtools/client/shared/test/frame-script-utils.js
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js

devtools/client/application/test/browser_application_panel_debug-service-worker.js

@@ -3,14 +3,14 @@
 
 "use strict";
 
-/* import-globals-from ../../debugger/new/test/mochitest/helpers.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers.js */
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/devtools/client/debugger/new/test/mochitest/helpers.js",
+  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/helpers.js",
   this);
 
-/* import-globals-from ../../debugger/new/test/mochitest/helpers/context.js */
+/* import-globals-from ../../debugger/test/mochitest/helpers/context.js */
 Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/devtools/client/debugger/new/test/mochitest/helpers/context.js",
+  "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/helpers/context.js",
   this);
 
 const TAB_URL = URL_ROOT + "service-workers/debug.html";