1 files changed, 15 insertions, 6 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
index 858579815..9bbda59a8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
@@ -10,9 +10,7 @@ Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
 // Allow the mismatch UI to show
 Services.prefs.setBoolPref("extensions.showMismatchUI", true);
 
-Components.utils.import("resource://testing-common/MockRegistrar.jsm");
-
-var Ci = Components.interfaces;
+const Ci = Components.interfaces;
 const extDir = gProfD.clone();
 extDir.append("extensions");
 
@@ -20,7 +18,7 @@ var gCachePurged = false;
 
 // Override the window watcher
 var WindowWatcher = {
-  openWindow: function(parent, url, name, features, args) {
+  openWindow: function(parent, url, name, features, arguments) {
     do_check_false(gCachePurged);
   },
 
@@ -33,7 +31,18 @@ var WindowWatcher = {
   }
 }
 
-MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1", WindowWatcher);
+var WindowWatcherFactory = {
+  createInstance: function createInstance(outer, iid) {
+    if (outer != null)
+      throw Components.results.NS_ERROR_NO_AGGREGATION;
+    return WindowWatcher.QueryInterface(iid);
+  }
+};
+
+var registrar = Components.manager.QueryInterface(AM_Ci.nsIComponentRegistrar);
+registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"),
+                          "Fake Window Watcher",
+                          "@mozilla.org/embedcomp/window-watcher;1", WindowWatcherFactory);
 
 /**
  * Start the test by installing extensions.
@@ -84,5 +93,5 @@ function run_test() {
     do_check_false(gCachePurged);
 
     do_test_finished();
-  });
+  });  
 }