From 311c4341fb3836f1d6c6b80960aaf85b699a93cd Mon Sep 17 00:00:00 2001
From: Jason Laster <jason.laster.11@gmail.com>
Date: Mon, 18 Sep 2017 08:47:51 -0400
Subject: [PATCH] sync changes w/ mc (#4060)

---
 assets/panel/prefs.js          | 5 -----
 src/test/mochitest/browser.ini | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/assets/panel/prefs.js b/assets/panel/prefs.js
index a3e9cdbd22..1cfe2dacad 100644
--- a/assets/panel/prefs.js
+++ b/assets/panel/prefs.js
@@ -1,16 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-#ifdef RELEASE_OR_BETA
-pref("devtools.debugger.new-debugger-frontend", false);
-#else
 pref("devtools.debugger.new-debugger-frontend", true);
-#endif
 
 // Enable the Debugger
 pref("devtools.debugger.enabled", true);
 pref("devtools.debugger.chrome-debugging-host", "localhost");
-pref("devtools.debugger.chrome-debugging-port", 6080);
 pref("devtools.debugger.chrome-debugging-websocket", false);
 pref("devtools.debugger.remote-host", "localhost");
 pref("devtools.debugger.remote-timeout", 20000);
diff --git a/src/test/mochitest/browser.ini b/src/test/mochitest/browser.ini
index fa2ffb33be..9e7e2e0314 100644
--- a/src/test/mochitest/browser.ini
+++ b/src/test/mochitest/browser.ini
@@ -50,14 +50,14 @@ support-files =
 [browser_dbg-breakpoints.js]
 [browser_dbg-breakpoints-toggle.js]
 [browser_dbg-breakpoints-reloading.js]
+skip-if = true # Bug 1383576
 [browser_dbg-breakpoints-cond.js]
 [browser_dbg-call-stack.js]
 [browser_dbg-expressions.js]
 [browser_dbg-scopes.js]
 [browser_dbg-chrome-create.js]
-skip-if = true
 [browser_dbg-chrome-debugging.js]
-skip-if = true
+skip-if = debug # bug 1374187
 [browser_dbg-console.js]
 [browser_dbg-debugger-buttons.js]
 [browser_dbg-editor-gutter.js]
@@ -68,6 +68,7 @@ skip-if = true
 [browser_dbg_keyboard-shortcuts.js]
 skip-if = os == "linux" # bug 1351952
 [browser_dbg-pause-exceptions.js]
+skip-if = true # Bug 1393121
 [browser_dbg-navigation.js]
 [browser_dbg-pretty-print.js]
 [browser_dbg-pretty-print-paused.js]
@@ -79,6 +80,7 @@ skip-if = os == "win" # Bug 1393121
 [browser_dbg-search-symbols.js]
 skip-if = os == "win" # Bug 1393121
 [browser_dbg-search-project.js]
+skip-if = true # Bug 1393121, 1393299
 [browser_dbg-sourcemaps.js]
 [browser_dbg-sourcemaps-reloading.js]
 [browser_dbg-sourcemaps2.js]