Bug 1651519: Remove nsIDOMWindowUtils::currentInnerWindowID. r=nika,remote-protocol-reviewers,webcompat-reviewers,whimboo

It has some properties which make it footgunny, especially in the face of Fission. Callers should use WindowGlobalChild.innerWindowId instead. Differential Revision: https://phabricator.services.mozilla.com/D82801
2020-07-21 16:59:28 +00:00 · 2020-07-21 16:59:28 +00:00 · 9c2c147159
--- a/browser/actors/WebRTCChild.jsm
+++ b/browser/actors/WebRTCChild.jsm
@ -504,7 +504,7 @@ function getTabStateForContentWindow(aContentWindow, aForRemove = false) {
 }

 function getInnerWindowIDForWindow(aContentWindow) {
-  return aContentWindow.windowUtils.currentInnerWindowID;
+  return aContentWindow.windowGlobalChild.innerWindowId;
 }

 function getMessageManagerForWindow(aContentWindow) {
--- a/browser/components/extensions/test/browser/browser_ext_getViews.js
+++ b/browser/components/extensions/test/browser/browser_ext_getViews.js
@ -102,7 +102,7 @@ async function promiseBrowserContentUnloaded(browser) {
    browser,
    MSG_WINDOW_DESTROYED,
    MSG_WINDOW_DESTROYED => {
-      let innerWindowId = this.content.windowUtils.currentInnerWindowID;
+      let innerWindowId = this.content.windowGlobalChild.innerWindowId;
      let observer = subject => {
        if (
          innerWindowId === subject.QueryInterface(Ci.nsISupportsPRUint64).data
--- a/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm
+++ b/browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm
@ -135,7 +135,7 @@ class ReportSiteIssueHelperChild extends JSWindowActorChild {
  }

  _getLoggedMessages(includePrivate = false) {
-    const windowId = this.contentWindow.windowUtils.currentInnerWindowID;
+    const windowId = this.contentWindow.windowGlobalChild.innerWindowId;
    return this._getConsoleMessages(windowId).concat(
      this._getScriptErrors(windowId, includePrivate)
    );
--- a/caps/tests/mochitest/test_bug995943.xhtml
+++ b/caps/tests/mochitest/test_bug995943.xhtml
@ -71,7 +71,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=995943

  var gGoCount = 0;
  function go() {
-    debug("Invoking go for window with id: " + window.windowUtils.currentInnerWindowID);
+    debug("Invoking go for window with id: " + window.windowGlobalChild.innerWindowId);
    is(++gGoCount, 1, "Should only call go once!");
    checkLoadFileURI('http://example.com', false).then(
      pushPrefs.bind(null, [['capability.policy.policynames', ' somepolicy '],
--- a/devtools/server/actors/addon/webextension-inspected-window.js
+++ b/devtools/server/actors/addon/webextension-inspected-window.js
@ -80,7 +80,7 @@ function logAccessDeniedWarning(window, callerInfo, extensionPolicy) {

  const msg = `The extension "${name}" is not allowed to access ${reportedURI.spec}`;

-  const innerWindowId = window.windowUtils.currentInnerWindowID;
+  const innerWindowId = window.windowGlobalChild.innerWindowId;

  const errorFlag = 0;

--- a/devtools/server/actors/network-monitor/eventsource-actor.js
+++ b/devtools/server/actors/network-monitor/eventsource-actor.js
@ -46,7 +46,7 @@ const EventSourceActor = ActorClassWithSpec(eventSourceSpec, {

  startListening: function() {
    this.stopListening();
-    this.innerWindowID = this.targetActor.window.windowUtils.currentInnerWindowID;
+    this.innerWindowID = this.targetActor.window.windowGlobalChild.innerWindowId;
    eventSourceEventService.addListener(this.innerWindowID, this);
  },

--- a/devtools/server/actors/network-monitor/websocket-actor.js
+++ b/devtools/server/actors/network-monitor/websocket-actor.js
@ -50,7 +50,7 @@ const WebSocketActor = ActorClassWithSpec(webSocketSpec, {

  startListening: function() {
    this.stopListening();
-    this.innerWindowID = this.targetActor.window.windowUtils.currentInnerWindowID;
+    this.innerWindowID = this.targetActor.window.windowGlobalChild.innerWindowId;
    webSocketEventService.addListener(this.innerWindowID, this);
  },

--- a/devtools/server/actors/storage.js
+++ b/devtools/server/actors/storage.js
@ -3519,7 +3519,7 @@ const StorageActor = protocol.ActorClassWithSpec(specs.storageSpec, {
  getWindowFromInnerWindowID(innerID) {
    innerID = innerID.QueryInterface(Ci.nsISupportsPRUint64).data;
    for (const win of this.childWindowPool.values()) {
-      const id = win.windowUtils.currentInnerWindowID;
+      const id = win.windowGlobalChild.innerWindowId;
      if (id == innerID) {
        return win;
      }
--- a/devtools/server/actors/targets/browsing-context.js
+++ b/devtools/server/actors/targets/browsing-context.js
@ -83,7 +83,7 @@ loader.lazyRequireGetter(
 );

 function getWindowID(window) {
-  return window.windowUtils.currentInnerWindowID;
+  return window.windowGlobalChild.innerWindowId;
 }

 function getDocShellChromeEventHandler(docShell) {
@ -123,7 +123,7 @@ exports.getChildDocShells = getChildDocShells;
 */

 function getInnerId(window) {
-  return window.windowUtils.currentInnerWindowID;
+  return window.windowGlobalChild.innerWindowId;
 }

 const browsingContextTargetPrototype = {
--- a/devtools/server/actors/webconsole/utils.js
+++ b/devtools/server/actors/webconsole/utils.js
@ -88,10 +88,10 @@ var WebConsoleUtils = {
   *         Inner ID for the given window, null if we can't access it.
   */
  getInnerWindowId: function(window) {
-    // Might throw with SecurityError: Permission denied to access property "windowUtils"
-    // on cross-origin object.
+    // Might throw with SecurityError: Permission denied to access property
+    // "windowGlobalChild" on cross-origin object.
    try {
-      return window.windowUtils.currentInnerWindowID;
+      return window.windowGlobalChild.innerWindowId;
    } catch (e) {
      return null;
    }
@ -546,7 +546,7 @@ WebConsoleCommands._registerOriginal("cd", function(owner, window) {
    0,
    1,
    "content javascript",
-    owner.window.windowUtils.currentInnerWindowID
+    owner.window.windowGlobalChild.innerWindowId
  );
  const Services = require("Services");
  Services.console.logMessage(scriptError);
--- a/devtools/shared/content-observer.js
+++ b/devtools/shared/content-observer.js
@ -72,5 +72,5 @@ ContentObserver.prototype = {
 // Utility functions.

 ContentObserver.GetInnerWindowID = function(window) {
-  return window.windowUtils.currentInnerWindowID;
+  return window.windowGlobalChild.innerWindowId;
 };
--- a/devtools/shared/screenshot/capture.js
+++ b/devtools/shared/screenshot/capture.js
@ -201,7 +201,7 @@ function logInPage(text, flags, window) {
    0,
    flags,
    "screenshot",
-    window.windowUtils.currentInnerWindowID
+    window.windowGlobalChild.innerWindowId
  );
  Services.console.logMessage(scriptError);
 }
--- a/devtools/shared/webconsole/test/chrome/test_consoleapi_innerID.html
+++ b/devtools/shared/webconsole/test/chrome/test_consoleapi_innerID.html
@ -22,7 +22,7 @@ function doConsoleCalls(aState)
 {
  const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
  const console = new ConsoleAPI({
-    innerID: window.windowUtils.currentInnerWindowID
+    innerID: window.windowGlobalChild.innerWindowId
  });

  const longString = (new Array(DevToolsServer.LONG_STRING_LENGTH + 2)).join("a");
--- a/docshell/test/browser/browser_onbeforeunload_navigation.js
+++ b/docshell/test/browser/browser_onbeforeunload_navigation.js
@ -123,7 +123,7 @@ add_task(async function test() {
          let { testFns } = this.content.wrappedJSObject;
          this.content.onbeforeunload = testFns[testIdx];
          this.content.location = url;
-          return this.content.windowUtils.currentInnerWindowID;
+          return this.content.windowGlobalChild.innerWindowId;
        }
      );

@ -142,7 +142,7 @@ add_task(async function test() {
              "Page should have navigated to the correct URL"
            );
            Assert.notEqual(
-              this.content.windowUtils.currentInnerWindowID,
+              this.content.windowGlobalChild.innerWindowId,
              winID,
              "Page should have a new inner window"
            );
@ -157,7 +157,7 @@ add_task(async function test() {
            "Page should have the same URL"
          );
          Assert.equal(
-            this.content.windowUtils.currentInnerWindowID,
+            this.content.windowGlobalChild.innerWindowId,
            winID,
            "Page should have the same inner window"
          );
--- a/dom/base/DOMRequestHelper.jsm
+++ b/dom/base/DOMRequestHelper.jsm
@ -157,8 +157,7 @@ DOMRequestIpcHelper.prototype = {
    this._window = aWindow;
    if (this._window) {
      // We don't use this.innerWindowID, but other classes rely on it.
-      let util = this._window.windowUtils;
-      this.innerWindowID = util.currentInnerWindowID;
+      this.innerWindowID = this._window.windowGlobalChild.innerWindowId;
    }

    this._destroyed = false;
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@ -2146,20 +2146,6 @@ nsDOMWindowUtils::GetOuterWindowID(uint64_t* aWindowID) {
  return NS_OK;
 }

-NS_IMETHODIMP
-nsDOMWindowUtils::GetCurrentInnerWindowID(uint64_t* aWindowID) {
-  nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryReferent(mWindow);
-  NS_ENSURE_TRUE(window, NS_ERROR_NOT_AVAILABLE);
-
-  nsGlobalWindowInner* inner =
-      nsGlobalWindowOuter::Cast(window)->GetCurrentInnerWindowInternal();
-  if (!inner) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  *aWindowID = inner->WindowID();
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::SuspendTimeouts() {
  nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryReferent(mWindow);
--- a/dom/base/test/test_eventsourceservice_basic.html
+++ b/dom/base/test/test_eventsourceservice_basic.html
@ -14,7 +14,7 @@ var service = SpecialPowers.Cc["@mozilla.org/eventsourceevent/service;1"]
                .getService(SpecialPowers.Ci.nsIEventSourceEventService);
 ok(!!service, "We have the nsIEventSourceEventService");

-var innerId = SpecialPowers.getDOMWindowUtils(window).currentInnerWindowID;
+var innerId = SpecialPowers.wrap(window).windowGlobalChild.innerWindowId;
 ok(innerId, "We have a valid innerWindowID: " + innerId);

 var channelId = null;
@ -66,4 +66,4 @@ SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
-</html>
+</html>
--- a/dom/base/test/test_eventsourceservice_reconnect_error.html
+++ b/dom/base/test/test_eventsourceservice_reconnect_error.html
@ -14,7 +14,7 @@ var service = SpecialPowers.Cc["@mozilla.org/eventsourceevent/service;1"]
                .getService(SpecialPowers.Ci.nsIEventSourceEventService);
 ok(!!service, "We have the nsIEventSourceEventService");

-var innerId = SpecialPowers.getDOMWindowUtils(window).currentInnerWindowID;
+var innerId = SpecialPowers.wrap(window).windowGlobalChild.innerWindowId;
 ok(innerId, "We have a valid innerWindowID: " + innerId);

 var channelId;
@ -69,4 +69,4 @@ function checkCallsCount() {
 </script>
 </pre>
 </body>
-</html>
+</html>
--- a/dom/base/test/test_eventsourceservice_status_error.html
+++ b/dom/base/test/test_eventsourceservice_status_error.html
@ -14,7 +14,7 @@ var service = SpecialPowers.Cc["@mozilla.org/eventsourceevent/service;1"]
                .getService(SpecialPowers.Ci.nsIEventSourceEventService);
 ok(!!service, "We have the nsIEventSourceEventService");

-var innerId = SpecialPowers.getDOMWindowUtils(window).currentInnerWindowID;
+var innerId = SpecialPowers.wrap(window).windowGlobalChild.innerWindowId;
 ok(innerId, "We have a valid innerWindowID: " + innerId);

 var listener = {
@ -64,4 +64,4 @@ function doTest(status) {
 </script>
 </pre>
 </body>
-</html>
+</html>
--- a/dom/base/test/test_eventsourceservice_worker.html
+++ b/dom/base/test/test_eventsourceservice_worker.html
@ -14,7 +14,7 @@ var service = SpecialPowers.Cc["@mozilla.org/eventsourceevent/service;1"]
                .getService(SpecialPowers.Ci.nsIEventSourceEventService);
 ok(!!service, "We have the nsIEventSourceEventService");

-var innerId = SpecialPowers.getDOMWindowUtils(window).currentInnerWindowID;
+var innerId = SpecialPowers.wrap(window).windowGlobalChild.innerWindowId;
 ok(innerId, "We have a valid innerWindowID: " + innerId);

 var channelId = null;
@ -58,4 +58,4 @@ SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
-</html>
+</html>
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@ -134,9 +134,8 @@ BrowserElementChild.prototype = {
  },

  _tryGetInnerWindowID(win) {
-    let utils = win.windowUtils;
    try {
-      return utils.currentInnerWindowID;
+      return win.windowGlobalChild.innerWindowId;
    } catch (e) {
      return null;
    }
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@ -1298,12 +1298,6 @@ interface nsIDOMWindowUtils : nsISupports {
   */
  readonly attribute unsigned long long outerWindowID;

-  /**
-   * Get the id of the current inner window of this window.  If there
-   * is no current inner window, throws NS_ERROR_NOT_AVAILABLE.
-   */
-  readonly attribute unsigned long long currentInnerWindowID;
-
  /**
   * Put the window into a state where scripts are frozen and events
   * suppressed, for use when the window has launched a modal prompt.
--- a/dom/media/IdpSandbox.jsm
+++ b/dom/media/IdpSandbox.jsm
@ -257,7 +257,7 @@ IdpSandbox.prototype = {
  // can't rethrow anything else because that could leak information about the
  // internal workings of the IdP across origins.
  _logError(e) {
-    let winID = this.window.windowUtils.currentInnerWindowID;
+    let winID = this.window.windowGlobalChild.innerWindowId;
    let scriptError = Cc["@mozilla.org/scripterror;1"].createInstance(
      Ci.nsIScriptError
    );
--- a/dom/media/PeerConnection.jsm
+++ b/dom/media/PeerConnection.jsm
@ -253,7 +253,7 @@ setupPrototype(RTCIceCandidate, {
 class RTCSessionDescription {
  init(win) {
    this._win = win;
-    this._winID = this._win.windowUtils.currentInnerWindowID;
+    this._winID = this._win.windowGlobalChild.innerWindowId;
  }

  __init({ type, sdp }) {
@ -389,7 +389,7 @@ class RTCPeerConnection {
  }

  __init(rtcConfig) {
-    this._winID = this._win.windowUtils.currentInnerWindowID;
+    this._winID = this._win.windowGlobalChild.innerWindowId;
    // TODO: Update this code once we support pc.setConfiguration, to track
    // setting from content independently from pref (Bug 1181768).
    if (
@ -2020,7 +2020,7 @@ setupPrototype(PeerConnectionObserver, {

 class RTCPeerConnectionStatic {
  init(win) {
-    this._winID = win.windowUtils.currentInnerWindowID;
+    this._winID = win.windowGlobalChild.innerWindowId;
  }

  registerPeerConnectionLifecycleCallback(cb) {
--- a/dom/push/test/test_utils.js
+++ b/dom/push/test/test_utils.js
@ -216,8 +216,8 @@ function injectControlledFrame(target = document.body) {
          : Promise.reject(new Error("Frame removed from document"));
      },
      innerWindowId() {
-        var utils = SpecialPowers.getDOMWindowUtils(iframe.contentWindow);
-        return utils.currentInnerWindowID;
+        return SpecialPowers.wrap(iframe).browsingContext.currentWindowContext
+          .innerWindowId;
      },
    };

--- a/dom/tests/browser/browser_ConsoleStorageAPITests.js
+++ b/dom/tests/browser/browser_ConsoleStorageAPITests.js
@ -40,7 +40,7 @@ add_task(async function() {
          if (aTopic == "console-storage-cache-event") {
            apiCallCount++;
            if (apiCallCount == 4) {
-              let windowId = content.window.windowUtils.currentInnerWindowID;
+              let windowId = content.windowGlobalChild.innerWindowId;

              Services.obs.removeObserver(this, "console-storage-cache-event");
              ok(
--- a/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js
+++ b/dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js
@ -17,7 +17,7 @@ function test() {
  );

  function getInnerWindowId(aWindow) {
-    return aWindow.windowUtils.currentInnerWindowID;
+    return aWindow.windowGlobalChild.innerWindowId;
  }

  function whenNewWindowLoaded(aOptions, aCallback) {
--- a/dom/tests/browser/file_postMessage_parent.html
+++ b/dom/tests/browser/file_postMessage_parent.html
@ -2,7 +2,7 @@
 <script>
  dump("Content running top level script " + window.location.href + "\n");

-  var winID = SpecialPowers.getDOMWindowUtils(this).currentInnerWindowID;
+  var winID = SpecialPowers.wrap(this).windowGlobalChild.innerWindowId;

  var observer = {
    observe(subject, topic) {
--- a/dom/tests/mochitest/bugs/test_bug534149.html
+++ b/dom/tests/mochitest/bugs/test_bug534149.html
@ -23,8 +23,10 @@ function getIDs(iframe) {
  // Force inner creation
  win.document;

-  var util = SpecialPowers.getDOMWindowUtils(win);
-  return [util.outerWindowID, util.currentInnerWindowID];
+  return [
+    SpecialPowers.getDOMWindowUtils(win).outerWindowID,
+    SpecialPowers.wrap(win).windowGlobalChild.innerWindowId,
+  ];
 }

 var i1 = document.createElement("iframe");
--- a/dom/websocket/tests/test_websocket_frame.html
+++ b/dom/websocket/tests/test_websocket_frame.html
@ -26,7 +26,7 @@ var tests = [
  { payload: (function() { var buffer = ""; for (var i = 0; i < 120; ++i) buffer += i; return buffer; }()) },
 ]

-var innerId = window.top.windowUtils.currentInnerWindowID;
+var innerId = window.top.windowGlobalChild.innerWindowId;
 ok(innerId, "We have a valid innerWindowID: " + innerId);

 var service = Cc["@mozilla.org/websocketevent/service;1"]
--- a/js/xpconnect/tests/chrome/test_scripterror.html
+++ b/js/xpconnect/tests/chrome/test_scripterror.html
@ -38,7 +38,7 @@ function hasExpectedProperties(message, exception) {
  is(message.sourceName, location.href, "has correct sourceName/filename");
  ok(message.lineNumber > 0, "has lineNumber");

-  is(message.innerWindowID, window.windowUtils.currentInnerWindowID,
+  is(message.innerWindowID, window.windowGlobalChild.innerWindowId,
     "correct innerWindowID");
 }

--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@ -1439,12 +1439,11 @@ NS_IMETHODIMP HttpBaseChannel::GetTopLevelContentWindowId(uint64_t* aWindowId) {
    if (loadContext) {
      nsCOMPtr<mozIDOMWindowProxy> topWindow;
      loadContext->GetTopWindow(getter_AddRefs(topWindow));
-      nsCOMPtr<nsIDOMWindowUtils> windowUtils;
      if (topWindow) {
-        windowUtils = nsGlobalWindowOuter::Cast(topWindow)->WindowUtils();
-      }
-      if (windowUtils) {
-        windowUtils->GetCurrentInnerWindowID(&mContentWindowId);
+        if (nsPIDOMWindowInner* inner =
+                nsPIDOMWindowOuter::From(topWindow)->GetCurrentInnerWindow()) {
+          mContentWindowId = inner->WindowID();
+        }
      }
    }
  }
--- a/remote/domains/content/Page.jsm
+++ b/remote/domains/content/Page.jsm
@ -241,7 +241,7 @@ class Page extends ContentProcessDomain {
    const window = defaultContext.window;

    const executionContextId = Runtime._onContextCreated("context-created", {
-      windowId: window.windowUtils.currentInnerWindowID,
+      windowId: window.windowGlobalChild.innerWindowId,
      window,
      isDefault: false,
      contextName: worldName,
--- a/remote/domains/content/Runtime.jsm
+++ b/remote/domains/content/Runtime.jsm
@ -89,7 +89,7 @@ class Runtime extends ContentProcessDomain {
      // after we replied to `enable` request.
      executeSoon(() => {
        this._onContextCreated("context-created", {
-          windowId: this.content.windowUtils.currentInnerWindowID,
+          windowId: this.content.windowGlobalChild.innerWindowId,
          window: this.content,
          isDefault: true,
        });
@ -325,8 +325,7 @@ class Runtime extends ContentProcessDomain {

  _getDefaultContextForWindow(innerWindowId) {
    if (!innerWindowId) {
-      const { windowUtils } = this.content;
-      innerWindowId = windowUtils.currentInnerWindowID;
+      innerWindowId = this.content.windowGlobalChild.innerWindowId;
    }
    const curContexts = this.innerWindowIdToContexts.get(innerWindowId);
    if (curContexts) {
--- a/remote/domains/content/runtime/ExecutionContext.jsm
+++ b/remote/domains/content/runtime/ExecutionContext.jsm
@ -48,7 +48,7 @@ class ExecutionContext {
    // Here, we assume that debuggee is a window object and we will propably have
    // to adapt that once we cover workers or contexts that aren't a document.
    this.window = debuggee;
-    this.windowId = debuggee.windowUtils.currentInnerWindowID;
+    this.windowId = debuggee.windowGlobalChild.innerWindowId;
    this.id = id;
    this.frameId = debuggee.docShell.browsingContext.id.toString();
    this.isDefault = isDefault;
--- a/remote/observers/ContextObserver.jsm
+++ b/remote/observers/ContextObserver.jsm
@ -74,8 +74,8 @@ class ContextObserver {

  handleEvent({ type, target, persisted }) {
    const window = target.defaultView;
-    const frameId = window.docShell.browsingContext.id;
-    const id = window.windowUtils.currentInnerWindowID;
+    const frameId = window.browsingContext.id;
+    const id = window.windowGlobalChild.innerWindowId;

    switch (type) {
      case "DOMWindowCreated":
--- a/testing/specialpowers/content/SpecialPowersChild.jsm
+++ b/testing/specialpowers/content/SpecialPowersChild.jsm
@ -231,7 +231,7 @@ class SpecialPowersChild extends JSWindowActorChild {
    let window = this.contentWindow;
    // We should not invoke the getter.
    if (!("SpecialPowers" in window.wrappedJSObject)) {
-      this._windowID = window.windowUtils.currentInnerWindowID;
+      this._windowID = window.windowGlobalChild.innerWindowId;

      defineSpecialPowers(this);
      if (this.IsInNestedFrame) {
--- a/testing/specialpowers/content/WrapPrivileged.jsm
+++ b/testing/specialpowers/content/WrapPrivileged.jsm
@ -132,7 +132,9 @@ function wrapPrivileged(obj, win) {
  let { windowID, proxies, handler } = perWindowInfo.get(win) || {};
  // |windowUtils| is undefined if |win| is a non-window object
  // such as a sandbox.
-  let currentID = win.windowUtils ? win.windowUtils.currentInnerWindowID : 0;
+  let currentID = win.windowGlobalChild
+    ? win.windowGlobalChild.innerWindowId
+    : 0;
  // Values are dead objects if the inner window is changed.
  if (windowID !== currentID) {
    windowID = currentID;
--- a/toolkit/components/extensions/ExtensionUtils.jsm
+++ b/toolkit/components/extensions/ExtensionUtils.jsm
@ -109,7 +109,7 @@ class DefaultMap extends Map {
 }

 function getInnerWindowID(window) {
-  return window.windowUtils.currentInnerWindowID;
+  return window.windowGlobalChild?.innerWindowId;
 }

 /**
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_devtools_metadata.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_contentscript_devtools_metadata.html
@ -48,7 +48,7 @@ add_task(async function test_contentscript_devtools_sandbox_metadata() {

  let win = window.open("file_sample.html");

-  let innerWindowID = SpecialPowers.getDOMWindowUtils(win).currentInnerWindowID;
+  let innerWindowID = SpecialPowers.wrap(win).windowGlobalChild.innerWindowId;

  await extension.awaitFinish("contentScript.executed");

--- a/toolkit/components/extensions/test/xpcshell/test_ext_contexts_gc.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_contexts_gc.js
@ -191,7 +191,8 @@ add_task(async function test_ExtensionPageContextChild_in_child_frame() {
    let frame = this.content.document.querySelector(
      "iframe[src*='iframe.html']"
    );
-    let innerWindowID = frame.contentWindow.windowUtils.currentInnerWindowID;
+    let innerWindowID =
+      frame.browsingContext.currentWindowContext.innerWindowId;
    let context = ExtensionPageChild.extensionContexts.get(innerWindowID);

    Assert.ok(context, "Got extension page context for child frame");
@ -237,7 +238,7 @@ add_task(async function test_ExtensionPageContextChild_in_toplevel() {
      "resource://gre/modules/ExtensionPageChild.jsm"
    );

-    let innerWindowID = this.content.windowUtils.currentInnerWindowID;
+    let innerWindowID = this.content.windowGlobalChild.innerWindowId;
    let context = ExtensionPageChild.extensionContexts.get(innerWindowID);

    Assert.ok(context, "Got extension page context for top-level document");
--- a/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
+++ b/toolkit/components/passwordmgr/InsecurePasswordUtils.jsm
@ -51,7 +51,7 @@ this.InsecurePasswordUtils = {
   *         Inner ID for the given window.
   */
  _getInnerWindowId(window) {
-    return window.windowUtils.currentInnerWindowID;
+    return window.windowGlobalChild.innerWindowId;
  },

  _sendWebConsoleMessage(messageTag, domDoc) {
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@ -69,7 +69,7 @@ var AboutReader = function(actor, articlePromise) {

  this._docRef = Cu.getWeakReference(doc);
  this._winRef = Cu.getWeakReference(win);
-  this._innerWindowId = win.windowUtils.currentInnerWindowID;
+  this._innerWindowId = win.windowGlobalChild.innerWindowId;

  this._article = null;
  this._languagePromise = new Promise(resolve => {
--- a/toolkit/mozapps/extensions/amInstallTrigger.jsm
+++ b/toolkit/mozapps/extensions/amInstallTrigger.jsm
@ -37,8 +37,7 @@ function CallbackObject(id, callback, mediator) {
 }

 function RemoteMediator(window) {
-  let utils = window.windowUtils;
-  this._windowID = utils.currentInnerWindowID;
+  this._windowID = window.windowGlobalChild.innerWindowId;

  this.mm = window.docShell.messageManager;
  this.mm.addWeakMessageListener(MSG_INSTALL_CALLBACK, this);