From 3124db66ebe9d616b12b6e44501777fe566d99b5 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Tue, 13 Feb 2018 14:41:44 +0100
Subject: [PATCH] Bug 1437856 - Enable new frontend in browser console in new
 console test folder; r=miker.

We take this as an advantage to change the bug number for the browser_console test
migration.

MozReview-Commit-ID: 2EbvXJ6Qz08

--HG--
extra : rebase_source : 71c4df1bc44a138b4cae3b96cc8bdef469686b2c
---
 .../test/mochitest/browser.ini                | 26 +++++++++----------
 .../new-console-output/test/mochitest/head.js | 10 +++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index 4ce4880803ed..d118007abcad 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -166,31 +166,31 @@ support-files =
   !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_console.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437806
 [browser_console_addonsdk_loader_exception.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437807
 [browser_console_clear_method.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437843
 [browser_console_consolejsm_output.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437844
 [browser_console_dead_objects.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437845
 [browser_console_error_source_click.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437847
 [browser_console_filters.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437848
 [browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437849
 [browser_console_nsiconsolemessage.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437850
 [browser_console_open_or_focus.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437851
 [browser_console_restore.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437852
 [browser_console_webconsole_ctrlw_close_tab.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437854
 [browser_console_webconsole_iframe_messages.js]
-skip-if = true # Bug 1406060
+skip-if = true # Bug 1437855
 [browser_console_webconsole_private_browsing.js]
 skip-if = true #	Bug 1403188
 # old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
index 992caf613744..490e00d7a142 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -31,14 +31,14 @@ const STATUS_CODES_GA_PARAMS = `?${new URLSearchParams({
   "utm_campaign": "default"
 })}`;
 
-Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
-registerCleanupFunction(function* () {
-  Services.prefs.clearUserPref("devtools.webconsole.new-frontend-enabled");
+Services.prefs.setBoolPref("devtools.browserconsole.new-frontend-enabled", true);
+registerCleanupFunction(async function () {
+  Services.prefs.clearUserPref("devtools.browserconsole.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();
+  await SpecialPowers.flushPrefEnv();
   Services.prefs.getChildList("devtools.webconsole.filter").forEach(pref => {
     Services.prefs.clearUserPref(pref);
   });
@@ -47,7 +47,7 @@ registerCleanupFunction(function* () {
     if (browserConsole.jsterm) {
       browserConsole.jsterm.clearOutput(true);
     }
-    yield HUDService.toggleBrowserConsole();
+    await HUDService.toggleBrowserConsole();
   }
 });