Bug 1568279. Remove some unnecessary QIs to nsIDOMChromeWindow. r=nalexander

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

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

mobile/android/chrome/content/aboutAddons.js

@@ -25,9 +25,7 @@ var gStringBundle = Services.strings.createBundle(
 );
 
 XPCOMUtils.defineLazyGetter(window, "gChromeWin", function() {
-  return window.docShell.rootTreeItem.domWindow.QueryInterface(
-    Ci.nsIDOMChromeWindow
-  );
+  return window.docShell.rootTreeItem.domWindow;
 });
 ChromeUtils.defineModuleGetter(
   window,

mobile/android/chrome/content/aboutLogins.js

@@ -11,8 +11,10 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 const { Accounts } = ChromeUtils.import("resource://gre/modules/Accounts.jsm");
 
-XPCOMUtils.defineLazyGetter(window, "gChromeWin", () =>
-  window.docShell.rootTreeItem.domWindow.QueryInterface(Ci.nsIDOMChromeWindow)
+XPCOMUtils.defineLazyGetter(
+  window,
+  "gChromeWin",
+  () => window.docShell.rootTreeItem.domWindow
 );
 
 ChromeUtils.defineModuleGetter(

mobile/android/chrome/content/aboutPrivateBrowsing.js

@@ -12,8 +12,10 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
 
-XPCOMUtils.defineLazyGetter(window, "gChromeWin", () =>
-  window.docShell.rootTreeItem.domWindow.QueryInterface(Ci.nsIDOMChromeWindow)
+XPCOMUtils.defineLazyGetter(
+  window,
+  "gChromeWin",
+  () => window.docShell.rootTreeItem.domWindow
 );
 
 document.addEventListener("DOMContentLoaded", function() {

mobile/android/components/ContentPermissionPrompt.js

@@ -61,10 +61,7 @@ ContentPermissionPrompt.prototype = {
   },
 
   getChromeWindow: function getChromeWindow(aWindow) {
-    let chromeWin = aWindow.docShell.rootTreeItem.domWindow.QueryInterface(
-      Ci.nsIDOMChromeWindow
-    );
-    return chromeWin;
+    return aWindow.docShell.rootTreeItem.domWindow;
   },
 
   getChromeForRequest: function getChromeForRequest(request) {

mobile/android/modules/ActionBarHandler.jsm

@@ -587,8 +587,7 @@ var ActionBarHandler = {
         if (chrome.BrowserApp && chrome.BrowserApp.loadURI) {
           chrome.BrowserApp.loadURI(uri);
         } else {
-          let bwin = chrome.QueryInterface(Ci.nsIDOMChromeWindow)
-            .browserDOMWindow;
+          let bwin = chrome.browserDOMWindow;
           if (bwin) {
             bwin.openURI(
               Services.io.newURI(uri),
@@ -647,8 +646,7 @@ var ActionBarHandler = {
             isPrivate: isPrivate,
           });
         } else {
-          let bwin = chrome.QueryInterface(Ci.nsIDOMChromeWindow)
-            .browserDOMWindow;
+          let bwin = chrome.browserDOMWindow;
           if (bwin) {
             bwin.openURI(
               searchSubmission.uri,

mobile/android/modules/WebrtcUI.jsm

@@ -365,10 +365,7 @@ var WebrtcUI = {
   },
 
   getChromeWindow: function getChromeWindow(aWindow) {
-    let chromeWin = aWindow.docShell.rootTreeItem.domWindow.QueryInterface(
-      Ci.nsIDOMChromeWindow
-    );
-    return chromeWin;
+    return aWindow.docShell.rootTreeItem.domWindow;
   },
 
   prompt: function prompt(

testing/specialpowers/content/SpecialPowersAPI.jsm

@@ -1036,9 +1036,7 @@ class SpecialPowersAPI extends JSWindowActorChild {
   // XXX: these APIs really ought to be removed, they're not e10s-safe.
   // (also they're pretty Firefox-specific)
   _getTopChromeWindow(window) {
-    return window.docShell.rootTreeItem.domWindow.QueryInterface(
-      Ci.nsIDOMChromeWindow
-    );
+    return window.docShell.rootTreeItem.domWindow;
   }
   _getAutoCompletePopup(window) {
     return this._getTopChromeWindow(window).document.getElementById(