browser_514751.js cleanup

browser/components/sessionstore/test/browser/browser_514751.js

@@ -52,8 +52,6 @@ function test() {
 
   let ss = Cc["@mozilla.org/browser/sessionstore;1"].
            getService(Ci.nsISessionStore);
-  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-           getService(Ci.nsIWindowWatcher);
 
   waitForExplicitFinish();
 
@@ -68,14 +66,8 @@ function test() {
     }]
   };
 
-  let windowObserver = {
+  var theWin = openDialog(location, "", "chrome,all,dialog=no");
-    observe: function(aSubject, aTopic, aData) {
-      let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
-
-      switch(aTopic) {
-        case "domwindowopened":
   theWin.addEventListener("load", function () {
-            theWin.removeEventListener("load", arguments.callee, false);
     executeSoon(function () {
       var gotError = false;
       try {
@@ -85,27 +77,10 @@ function test() {
           gotError = true;
       }
       ok(!gotError, "Didn't get a malformed URI error.");
-              executeSoon(function() {
       theWin.close();
-              });
-            });
-          }, false);
-          break;
-
-        case "domwindowclosed":
-          ww.unregisterNotification(this);
       is(browserWindowsCount(), 1, "Only one browser window should be open eventually");
       finish();
-          break;
+    });
-      }
+  }, false);
-    }
-  }
-  ww.registerNotification(windowObserver);
-  ww.openWindow(null,
-                location,
-                "_blank",
-                "chrome,all,dialog=no",
-                null);
-
 }