Merge pull request #34 from janekptacijarabaci/devtools_import-from-moebius_1

Port across devtools enhancements

2 files changed, 5 insertions, 5 deletions

diff --git a/toolkit/components/webextensions/ext-c-backgroundPage.js b/toolkit/components/webextensions/ext-c-backgroundPage.js
index b5074dd9a..ca446ce79 100644
--- a/toolkit/components/webextensions/ext-c-backgroundPage.js
+++ b/toolkit/components/webextensions/ext-c-backgroundPage.js
@@ -9,8 +9,8 @@ global.initializeBackgroundPage = (contentWindow) => {
     if (!alertDisplayedWarning) {
       require("devtools/client/framework/devtools-browser");
 
-      let hudservice = require("devtools/client/webconsole/hudservice");
-      hudservice.openBrowserConsoleOrFocus();
+      let {HUDService} = require("devtools/client/webconsole/hudservice");
+      HUDService.openBrowserConsoleOrFocus();
 
       contentWindow.console.warn("alert() is not supported in background windows; please use console.log instead.");
 
diff --git a/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html
index 3c4774652..471c5339d 100644
--- a/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html
@@ -66,14 +66,14 @@ add_task(function* testAlertNotShownInBackgroundWindow() {
 
   let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
   require("devtools/client/framework/devtools-browser");
-  let hudservice = require("devtools/client/webconsole/hudservice");
+  let {HUDService} = require("devtools/client/webconsole/hudservice");
 
   // And then double check that we have an actual browser console.
-  let haveConsole = !!hudservice.getBrowserConsole();
+  let haveConsole = !!HUDService.getBrowserConsole();
   ok(haveConsole, "Expected browser console to be open");
 
   if (haveConsole) {
-    yield hudservice.toggleBrowserConsole();
+    yield HUDService.toggleBrowserConsole();
   }
 
   yield extension.unload();