Bug 608911 - Invalid check in browser_bug562890.js. r=dtownsend, a=test fix

toolkit/mozapps/extensions/test/browser/Makefile.in

@@ -82,6 +82,7 @@ _TEST_FILES = \
   $(NULL)
 
 _TEST_RESOURCES = \
+  addon_prefs.xul \
   browser_bug557956.rdf \
   browser_bug557956_8_2.xpi \
   browser_bug557956_9_2.xpi \

toolkit/mozapps/extensions/test/browser/addon_prefs.xul

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="addon-test-pref-window">
   <label value="Oh hai!"/>

toolkit/mozapps/extensions/test/browser/browser_bug562890.js

@@ -11,7 +11,7 @@ function test() {
 
   waitForExplicitFinish();
 
-  var addonPrefsURI = TESTROOT + "addon_prefs.xul";
+  var addonPrefsURI = CHROMEROOT + "addon_prefs.xul";
 
   var gProvider = new MockProvider();
   gProvider.createAddons([{
@@ -50,19 +50,26 @@ function test() {
                                                                 "preferences-btn");
     is(prefsBtn.hidden, false, "Prefs button should be shown for addon with a optionsURL set")
 
-    Services.ww.registerNotification(function(aSubject, aTopic, aData) {
+    Services.ww.registerNotification(function TEST_ww_observer(aSubject, aTopic, aData) {
       if (aTopic == "domwindowclosed") {
-        Services.ww.unregisterNotification(arguments.callee);
+        Services.ww.unregisterNotification(TEST_ww_observer);
-        waitForFocus(function() {
+        // Give the preference window a chance to finish closing before closing
-          close_manager(aManager);
+        // the add-ons manager.
-          finish();
+        executeSoon(function() {
-        }, aManager);
+          close_manager(aManager, finish);
+        });
       } else if (aTopic == "domwindowopened") {
         let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
-        win.documentURI, addonPrefsURI, "The correct addon pref window should open"
+        win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
-        waitForFocus(function() {
+        win.addEventListener("load", function TEST_ww_onLoad() {
+          if (win.location != addonPrefsURI)
+            return;
+
+          win.removeEventListener("load", TEST_ww_onLoad, false);
+          is(win.location, addonPrefsURI,
+             "The correct addon pref window should have opened");
           win.close();
-        }, win);
+        }, false);
       }
     });