Bug 1300590 - Use DevToolsShim in the devtools.inspectedWindow.eval bindings tests. r=ochameau,jdescottes draft
authorLuca Greco <lgreco@mozilla.com>
Fri, 26 May 2017 17:09:45 +0200
changeset 588674 fd986bb89188fe065a55e25ede6d1b201865e350
parent 588673 9284d9a3ea6604501a1f6ed79390ddd61ad9b43c
child 631639 65ea8f2540e7f4997599b2c345c6584431be4120
push id62107
push userluca.greco@alcacoop.it
push dateSat, 03 Jun 2017 17:26:53 +0000
reviewersochameau, jdescottes
bugs1300590
milestone55.0a1
Bug 1300590 - Use DevToolsShim in the devtools.inspectedWindow.eval bindings tests. r=ochameau,jdescottes MozReview-Commit-ID: 8IYjIfBp5mB
browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
--- a/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
+++ b/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_eval_bindings.js
@@ -1,16 +1,14 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource://devtools/client/framework/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "devtools",
-                                  "resource://devtools/shared/Loader.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DevToolsShim",
+                                  "chrome://devtools-shim/content/DevToolsShim.jsm");
 
 /**
  * this test file ensures that:
  *
  * - devtools.inspectedWindow.eval provides the expected $0 and inspect bindings
  */
 add_task(async function test_devtools_inspectedWindow_eval_bindings() {
   const TEST_TARGET_URL = "http://mochi.test:8888/";
@@ -51,17 +49,19 @@ add_task(async function test_devtools_in
        </body>
       </html>`,
       "devtools_page.js": devtools_page,
     },
   });
 
   await extension.startup();
 
-  const target = devtools.TargetFactory.forTab(tab);
+  const {gDevTools} = DevToolsShim;
+
+  const target = gDevTools.getTargetForTab(tab);
   // Open the toolbox on the styleeditor, so that the inspector and the
   // console panel have not been explicitly activated yet.
   const toolbox = await gDevTools.showToolbox(target, "styleeditor");
   info("Developer toolbox opened");
 
   // Test $0 binding with no selected node
   info("Test inspectedWindow.eval $0 binding with no selected node");