Bug 1496360 - make BrowserWindowTracker and its deps use the docshell to obtain an outerWindowID, r=dao

Differential Revision: https://phabricator.services.mozilla.com/D11003

--HG--
extra : moz-landing-system : lando

browser/modules/BrowserWindowTracker.jsm

@@ -40,7 +40,7 @@ function _updateCurrentContentOuterWindowID(browser) {
     return;
   }
 
-  debug("Current window uri=" + browser.currentURI.spec +
+  debug("Current window uri=" + (browser.currentURI && browser.currentURI.spec) +
         " id=" + browser.outerWindowID);
 
   _lastTopLevelWindowID = browser.outerWindowID;

toolkit/content/browser-child.js

@@ -28,5 +28,5 @@ addEventListener("ImageContentLoaded", function(aEvent) {
 
 // We may not get any responses to Browser:Init if the browser element
 // is torn down too quickly.
-var outerWindowID = content.windowUtils.outerWindowID;
+var outerWindowID = docShell.outerWindowID;
 sendAsyncMessage("Browser:Init", {outerWindowID});

toolkit/content/widgets/browser.xml

@@ -460,7 +460,7 @@
           if (this.isRemoteBrowser) {
             return this._outerWindowID;
           }
-          return this.contentWindow.windowUtils.outerWindowID;
+          return this.docShell.outerWindowID;
         ]]></getter>
       </property>