From 0de19dd2b00eaf067bc8f10b5c6e8dbaed12391a Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Mon, 1 Aug 2016 15:52:08 -0700
Subject: [PATCH] Bug 1277910 - about:support should use nsIWindowMediator
 rather than nsIWindowWatcher r=felipe

---
 toolkit/components/addoncompat/tests/addon/bootstrap.js     | 6 ++----
 .../components/addoncompat/tests/compat-addon/bootstrap.js  | 6 ++----
 toolkit/modules/Troubleshoot.jsm                            | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/addoncompat/tests/addon/bootstrap.js b/toolkit/components/addoncompat/tests/addon/bootstrap.js
index 5e3b2fadfeee..8fbf706e4632 100644
--- a/toolkit/components/addoncompat/tests/addon/bootstrap.js
+++ b/toolkit/components/addoncompat/tests/addon/bootstrap.js
@@ -15,12 +15,10 @@ var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
 
 function forEachWindow(f)
 {
-  let wins = Services.ww.getWindowEnumerator("navigator:browser");
+  let wins = Services.wm.getEnumerator("navigator:browser");
   while (wins.hasMoreElements()) {
     let win = wins.getNext();
-    if (win.gBrowser) {
-      f(win);
-    }
+    f(win);
   }
 }
 
diff --git a/toolkit/components/addoncompat/tests/compat-addon/bootstrap.js b/toolkit/components/addoncompat/tests/compat-addon/bootstrap.js
index be5042198ebe..7c93bad0897e 100644
--- a/toolkit/components/addoncompat/tests/compat-addon/bootstrap.js
+++ b/toolkit/components/addoncompat/tests/compat-addon/bootstrap.js
@@ -12,12 +12,10 @@ const baseURL = "http://mochi.test:8888/browser/" +
 
 function forEachWindow(f)
 {
-  let wins = Services.ww.getWindowEnumerator("navigator:browser");
+  let wins = Services.wm.getEnumerator("navigator:browser");
   while (wins.hasMoreElements()) {
     let win = wins.getNext();
-    if (win.gBrowser) {
-      f(win);
-    }
+    f(win);
   }
 }
 
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index ce41ec3bc69d..c6dadaf4e8fd 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -209,7 +209,7 @@ var dataProviders = {
 
     data.numTotalWindows = 0;
     data.numRemoteWindows = 0;
-    let winEnumer = Services.ww.getWindowEnumerator("navigator:browser");
+    let winEnumer = Services.wm.getEnumerator("navigator:browser");
     while (winEnumer.hasMoreElements()) {
       data.numTotalWindows++;
       let remote = winEnumer.getNext().