Bug 1136378 - Use a browser's outerWindowId property rather than a CP…

…OW to identify marionette's content listeners.;r=mconley
rmottola · Aug 20, 2019 · 0c7174c · 0c7174c
1 parent 8b2f433
commit 0c7174c
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/testing/marionette/marionette-server.js b/testing/marionette/marionette-server.js
@@ -1454,16 +1454,11 @@ MarionetteServerConnection.prototype = {
       return this._browserIds.get(permKey);
     }
 
-    let contentWindow = browser.contentWindowAsCPOW;
-    if (contentWindow !== null && !Cu.isDeadWrapper(contentWindow)) {
-      let winId = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                               .getInterface(Ci.nsIDOMWindowUtils)
-                               .outerWindowID;
-      if (winId) {
-        winId += "";
-        this._browserIds.set(permKey, winId);
-        return winId;
-      }
+    let winId = browser.outerWindowID;
+    if (winId) {
+      winId += "";
+      this._browserIds.set(permKey, winId);
+      return winId;
     }
     return null;
   },