browser_discovery.js cleanup (no bug)

--HG--
extra : rebase_source : 3fb6f72db7f3b47905ecd167b3bfca3f829cc279

browser/base/content/test/browser_discovery.js

@@ -1,19 +1,16 @@
-var gBrowserHandler;
+var currentHandler;
 var browser;
 
 function doc() browser.contentDocument;
 
 function setHandlerFunc(aResultFunc) {
-  DOMLinkHandler.handleEvent = function (event) {
-    gBrowserHandler.call(DOMLinkHandler, event);
-    aResultFunc();
-  }
+  if (currentHandler)
+    gBrowser.removeEventListener("DOMLinkAdded", currentHandler, false);
+  gBrowser.addEventListener("DOMLinkAdded", aResultFunc, false);
+  currentHandler = aResultFunc;
 }
 
 function test() {
-  gBrowserHandler = DOMLinkHandler.handleEvent;
-  ok(gBrowserHandler, "found browser handler");
-
   waitForExplicitFinish();
 
   gBrowser.selectedTab = gBrowser.addTab();
@@ -120,10 +117,7 @@ function runMultipleEnginesTestAndFinalize() {
   is(browser.engines[0].uri, "http://first.mozilla.com/search.xml", "first engine wins");
 
   gBrowser.removeCurrentTab();
-
-  // Reset the default link handler
-  DOMLinkHandler.handleEvent = gBrowserHandler;
-
+  gBrowser.removeEventListener("DOMLinkAdded", currentHandler, false);
   finish();
 }