From 2adf92413a826dba8470b03c7a4b2ab1d4cb4b9d Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 6 Aug 2012 22:38:19 +0200
Subject: [PATCH] Bug 778420 - Fix up tests that don't like the new
 enablePrivilege, r=jmaher.

--HG--
extra : rebase_source : 07565c66b279ba5a58b5902b697110f940c255fd
---
 .../base/content/test/test_contextmenu.html   | 11 +++----
 content/base/test/test_bug345339.html         |  8 ++---
 content/base/test/test_bug422537.html         | 17 ++++++-----
 content/canvas/test/test_canvas.html          | 29 ++++++++-----------
 content/html/content/test/test_bug143220.html | 17 +++++------
 content/media/test/manifest.js                | 18 +++++-------
 docshell/test/navigation/NavigationUtils.js   |  9 +++---
 docshell/test/navigation/file_bug534178.html  |  1 -
 docshell/test/navigation/test_bug386782.html  |  3 --
 docshell/test/test_bug369814.html             | 18 ++++++------
 docshell/test/test_bug509055.html             |  9 +++---
 docshell/test/test_bug529119-1.html           |  9 ++----
 docshell/test/test_bug529119-2.html           | 12 ++------
 dom/tests/mochitest/bugs/test_bug317448.html  |  8 ++---
 .../libeditor/html/tests/test_bug520189.html  |  3 +-
 gfx/tests/mochitest/test_acceleration.html    |  9 +++---
 layout/base/tests/test_bug450930.xhtml        | 12 ++------
 .../mixedcontent/mixedContentTest.js          |  4 +--
 18 files changed, 82 insertions(+), 115 deletions(-)

diff --git a/browser/base/content/test/test_contextmenu.html b/browser/base/content/test/test_contextmenu.html
index ad6d29b5b7f6..87086f1d2ead 100644
--- a/browser/base/content/test/test_contextmenu.html
+++ b/browser/base/content/test/test_contextmenu.html
@@ -18,9 +18,7 @@ Browser context menu tests.
 
 /** Test for Login Manager: multiple login autocomplete. **/
 
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-Components.utils.import("resource://gre/modules/InlineSpellChecker.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
+SpecialPowers.wrap(Components).utils.import("resource://gre/modules/InlineSpellChecker.jsm", window);
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -729,7 +727,7 @@ function runTest(testNum) {
 
     case 24:
         // Context menu for selected text
-        if (Services.appinfo.OS == "Darwin") {
+        if (SpecialPowers.Services.appinfo.OS == "Darwin") {
           // This test is only enabled on Mac due to bug 736399.
           checkContextMenu(["context-copy",                        true,
                             "context-selectall",                   true,
@@ -745,7 +743,7 @@ function runTest(testNum) {
 
     case 25:
         // Context menu for selected text which matches valid URL pattern
-        if (Services.appinfo.OS == "Darwin") {
+        if (SpecialPowers.Services.appinfo.OS == "Darwin") {
           // This test is only enabled on Mac due to bug 736399.
           checkContextMenu(["context-openlinkincurrent",           true,
                             "context-openlinkintab",               true,
@@ -790,8 +788,7 @@ var text, link, mailto, input, img, canvas, video_ok, video_bad, video_bad2,
     inputspell, pagemenu, dom_full_screen, plainTextItems, audio_in_video;
 
 function startTest() {
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    chromeWin = subwindow
+    chromeWin = SpecialPowers.wrap(subwindow)
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIWebNavigation)
                     .QueryInterface(Ci.nsIDocShellTreeItem)
diff --git a/content/base/test/test_bug345339.html b/content/base/test/test_bug345339.html
index e31c7a51ce74..ac61781f87d8 100644
--- a/content/base/test/test_bug345339.html
+++ b/content/base/test/test_bug345339.html
@@ -32,15 +32,14 @@ function afterLoad() {
     iframeDoc.getElementById("password").value = "123456";
     iframeDoc.getElementById("hidden").value = "gecko";
 
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var file = Components.classes["@mozilla.org/file/directory_service;1"]
+    var file = SpecialPowers.wrap(Components).classes["@mozilla.org/file/directory_service;1"]
              .getService(Components.interfaces.nsIProperties)
              .get("TmpD", Components.interfaces.nsILocalFile);
     file.append("345339_test.file");
     file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);
     filePath = file.path;
 
-    iframeDoc.getElementById("file").value = filePath;
+    SpecialPowers.wrap(iframeDoc).getElementById("file").value = filePath;
 
     /* Reload the page */
     $("testframe").setAttribute("onload", "afterReload()");
@@ -62,8 +61,7 @@ function afterReload() {
        "password field value forgotten");
     is(iframeDoc.getElementById("hidden").value, "gecko",
        "hidden field value preserved");
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    is(iframeDoc.getElementById("file").value, filePath,
+    is(SpecialPowers.wrap(iframeDoc).getElementById("file").value, filePath,
        "file field value preserved");
 
     SimpleTest.finish();
diff --git a/content/base/test/test_bug422537.html b/content/base/test/test_bug422537.html
index fa897147a4d6..1de938650cf1 100644
--- a/content/base/test/test_bug422537.html
+++ b/content/base/test/test_bug422537.html
@@ -19,10 +19,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=422537
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 422537 **/
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-var isupports_string = Components.classes["@mozilla.org/supports-string;1"]
-                                 .createInstance(Components.interfaces.nsISupportsString);
+var isupports_string = SpecialPowers.wrap(Components)
+                                    .classes["@mozilla.org/supports-string;1"]
+                                    .createInstance(Components.interfaces.nsISupportsString);
 isupports_string.data = "foo";
 
 const url = "http://mochi.test:8888";
@@ -35,13 +34,15 @@ var body = [
 for each (var i in body) {
   var xhr = new XMLHttpRequest();
   xhr.open("POST", url, true);
-  xhr.send(i);
-  var chan = SpecialPowers.unwrap(SpecialPowers.wrap(xhr).channel);
+  if (i == isupports_string)
+    SpecialPowers.wrap(xhr).send(i);
+  else
+    xhr.send(i);
+  var chan = SpecialPowers.wrap(xhr).channel;
   if (!SpecialPowers.call_Instanceof(chan, Components.interfaces.nsIUploadChannel))
     throw "Must be an upload channel";
   var stream = chan.uploadStream;
-  if (!stream || !SpecialPowers.call_Instanceof(stream,
-                                                Components.interfaces.nsISeekableStream))
+  if (!stream || !SpecialPowers.call_Instanceof(stream, Components.interfaces.nsISeekableStream))
     throw "Stream must be seekable";
   // the following is a no-op, but should not throw an exception
   stream.seek(Components.interfaces.nsISeekableStream.NS_SEEK_CUR, 0);
diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
index afa072d807e0..794939a164e8 100644
--- a/content/canvas/test/test_canvas.html
+++ b/content/canvas/test/test_canvas.html
@@ -6,13 +6,14 @@
 <script>
 
 SimpleTest.waitForExplicitFinish();
+const Cc = SpecialPowers.wrap(Components).classes;
+const Cr = SpecialPowers.wrap(Components).results;
 
 function IsD2DEnabled() {
     var enabled = false;
 
     try {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-        enabled = Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled;
+        enabled = Cc["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled;
     } catch(e) {}
     
     return enabled;
@@ -26,10 +27,9 @@ function IsMacOSX10_5orOlder() {
     var is105orOlder = false;
 
     if (navigator.platform.indexOf("Mac") == 0) {
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-        var version = Components.classes["@mozilla.org/system-info;1"]
-                            .getService(Components.interfaces.nsIPropertyBag2)
-                            .getProperty("version");
+        var version = Cc["@mozilla.org/system-info;1"]
+                        .getService(Components.interfaces.nsIPropertyBag2)
+                        .getProperty("version");
         // the next line is correct: Mac OS 10.6 corresponds to Darwin version 10 !
         // Mac OS 10.5 would be Darwin version 9. the |version| string we've got here
         // is the Darwin version.
@@ -43,8 +43,7 @@ function IsAzureEnabled() {
   var enabled = false;
 
   try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var backend = Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
+    var backend = Cc["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
     enabled = (backend != "none");
   } catch (e) { }
 
@@ -55,8 +54,7 @@ function IsAzureSkia() {
   var enabled = false;
   
   try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var backend = Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
+    var backend = Cc["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
     enabled = (backend == "skia");
   } catch (e) { }
 
@@ -67,8 +65,7 @@ function IsAzureCairo() {
   var enabled = false;
   
   try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var backend = Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
+    var backend = Cc["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).getInfo().AzureCanvasBackend;
     enabled = (backend == "cairo");
   } catch (e) { }
 
@@ -126,7 +123,8 @@ ok(ctx.canvas === canvas, "ctx.canvas === canvas");
 function isPixel(ctx, x,y, r,g,b,a, d) {
 	var pos = x + "," + y;
 	var colour = r + "," + g + "," + b + "," + a;
-    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pixel = SpecialPowers.unwrap(SpecialPowers.wrap(ctx)
+                                                  .getImageData(x, y, 1, 1));
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
@@ -19804,9 +19802,8 @@ function test_bug397524() {
 <script>
 function test_bug405982() {
 
-var canvas = document.getElementById('c614');
+var canvas = SpecialPowers.wrap(document.getElementById('c614'));
 var ctx = canvas.getContext('2d');
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
 var _threw = false;
 try {
@@ -21123,7 +21120,6 @@ img.onload = wrapFunction(function ()
     ctx667.drawImage(img, 0, 25);
     // (The alpha values do not really survive float->int conversion, so just
     // do approximate comparisons)
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
     isPixel(ctx667, 12,40, 1,3,254,255, 0);
     isPixel(ctx667, 37,40, 8,252,248,191, 2);
     isPixel(ctx667, 62,40, 6,10,250,127, 4);
@@ -21250,7 +21246,6 @@ deferTest();
 img.onload = wrapFunction(function ()
 {
     ctx672.drawImage(img, 0, 0);
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
     isPixel(ctx672, 12,20, 255,255,0,255, 0);
     isPixel(ctx672, 50,20, 0,255,255,255, 0);
     isPixel(ctx672, 87,20, 0,0,255,255, 0);
diff --git a/content/html/content/test/test_bug143220.html b/content/html/content/test/test_bug143220.html
index 27e6f19a59c7..e3eddee9589c 100644
--- a/content/html/content/test/test_bug143220.html
+++ b/content/html/content/test/test_bug143220.html
@@ -24,10 +24,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=143220
 var leafName;
 var fullPath;
 
+
 function initVals() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
-                         .getService(Components.interfaces.nsIProperties);
+  var dirSvc = SpecialPowers.wrap(Components)
+                            .classes["@mozilla.org/file/directory_service;1"]
+                            .getService(Components.interfaces.nsIProperties);
   var file = dirSvc.get("XpcomLib", Components.interfaces.nsILocalFile);
   isnot(file, null, "Must have file here");
 
@@ -36,15 +37,13 @@ function initVals() {
 }
 
 function initControl1() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  $("i1").value = fullPath;
-  is($("i1").value, fullPath, "Should have set full path 1");
+  SpecialPowers.wrap($("i1")).value = fullPath;
+  is(SpecialPowers.wrap($("i1")).value, fullPath, "Should have set full path 1");
 }
 
 function initControl2() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  $("i2").value = fullPath;
-  is($("i2").value, fullPath, "Should have set full path 2");
+  SpecialPowers.wrap($("i2")).value = fullPath;
+  is(SpecialPowers.wrap($("i2")).value, fullPath, "Should have set full path 2");
 }
 
 initVals();
diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index d5674d38c273..05c0da31b1ad 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -159,10 +159,9 @@ function fileUriToSrc(path, mustExist) {
   if (navigator.appVersion.indexOf("Android") != -1)
     return path;
 
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   const Ci = Components.interfaces;
-  const Cc = Components.classes;
-  const Cr = Components.results;
+  const Cc = SpecialPowers.wrap(Components).classes;
+  const Cr = SpecialPowers.wrap(Components).results;
   var dirSvc = Cc["@mozilla.org/file/directory_service;1"].
                getService(Ci.nsIProperties);
   var f = dirSvc.get("CurWorkD", Ci.nsILocalFile);
@@ -444,8 +443,7 @@ function MediaTestManager() {
     // Force a GC after every completed testcase. This ensures that any decoders
     // with live threads waiting for the GC are killed promptly, to free up the
     // thread stacks' address space.
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    Components.utils.forceGC();
+    SpecialPowers.forceGC();
     
     while (this.testNum < this.tests.length && this.tokens.length < PARALLEL_TESTS) {
       var test = this.tests[this.testNum];
@@ -497,15 +495,14 @@ function mediaTestCleanup() {
       A[i].parentNode.removeChild(A[i]);
       A[i] = null;
     }
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    Components.utils.forceGC();
+    SpecialPowers.forceGC();
 }
 
 (function() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   // Ensure that preload preferences are comsistent
-  var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                               .getService(Components.interfaces.nsIPrefService);
+  var prefService = SpecialPowers.wrap(Components)
+                                 .classes["@mozilla.org/preferences-service;1"]
+                                 .getService(Components.interfaces.nsIPrefService);
   var branch = prefService.getBranch("media.");
   var oldDefault = 2;
   var oldAuto = 3;
@@ -522,7 +519,6 @@ function mediaTestCleanup() {
     branch.setBoolPref("opus.enabled", true);
 
   window.addEventListener("unload", function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     branch.setIntPref("preload.default", oldDefault);
     branch.setIntPref("preload.auto", oldAuto);
     if (oldOpus !== undefined)
diff --git a/docshell/test/navigation/NavigationUtils.js b/docshell/test/navigation/NavigationUtils.js
index ac73ecd134c0..191fc7a6feeb 100644
--- a/docshell/test/navigation/NavigationUtils.js
+++ b/docshell/test/navigation/NavigationUtils.js
@@ -98,17 +98,18 @@ function isInaccessible(wnd, message) {
 ///////////////////////////////////////////////////////////////////////////
 
 function xpcEnumerateContentWindows(callback) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
   var Ci = Components.interfaces;
-  var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                     .getService(Ci.nsIWindowWatcher);
+  var ww = SpecialPowers.wrap(Components)
+                        .classes["@mozilla.org/embedcomp/window-watcher;1"]
+                        .getService(Ci.nsIWindowWatcher);
   var enumerator = ww.getWindowEnumerator();
 
   var contentWindows = [];
 
   while (enumerator.hasMoreElements()) {
     var win = enumerator.getNext();
-    if (typeof ChromeWindow != "undefined" && win instanceof ChromeWindow) {
+    if (typeof ChromeWindow != "undefined" && SpecialPowers.call_Instanceof(win, ChromeWindow)) {
       var docshellTreeNode = win.QueryInterface(Ci.nsIInterfaceRequestor)
                                 .getInterface(Ci.nsIWebNavigation)
                                 .QueryInterface(Ci.nsIDocShellTreeNode);
diff --git a/docshell/test/navigation/file_bug534178.html b/docshell/test/navigation/file_bug534178.html
index 0bbf62174410..8bcedb6fbabe 100644
--- a/docshell/test/navigation/file_bug534178.html
+++ b/docshell/test/navigation/file_bug534178.html
@@ -4,7 +4,6 @@
     
       function testDone() {
         document.body.removeChild(document.body.firstChild);
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         var isOK = false;
         try {
           isOK = history.previous != location;
diff --git a/docshell/test/navigation/test_bug386782.html b/docshell/test/navigation/test_bug386782.html
index 609d7912a983..0b5d544b105d 100644
--- a/docshell/test/navigation/test_bug386782.html
+++ b/docshell/test/navigation/test_bug386782.html
@@ -60,7 +60,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
     }
 
     function beginTest() {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       gTest.window.document.body.focus();
 
       // WARNING: If the following test fails, give the setTimeout() in the onload()
@@ -74,7 +73,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
     }
     
     function goBack() {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       gTest.window.history.back();
       setTimeout(function() {
         SimpleTest.waitForFocus(checkStillEditable, gTest.window);
@@ -82,7 +80,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
     }
 
     function checkStillEditable() {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
       // Check that the contents are correct.
       is(gTest.window.document.body.innerHTML, gTest.expectedBodyAfterEdit, "Edited contents still correct?");
diff --git a/docshell/test/test_bug369814.html b/docshell/test/test_bug369814.html
index dc666ee03321..db8e37353188 100644
--- a/docshell/test/test_bug369814.html
+++ b/docshell/test/test_bug369814.html
@@ -186,9 +186,9 @@ var gNextTest = 0;
 
 function runNextTest()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-    getService(Components.interfaces.nsIPrefBranch);
+  var prefs = SpecialPowers.wrap(Components)
+                           .classes["@mozilla.org/preferences-service;1"]
+                           .getService(Components.interfaces.nsIPrefBranch);
 
   if (gNextTest < gTests.length) {
     gCurrentTest = gTests[gNextTest++];
@@ -214,9 +214,9 @@ function runNextTest()
 
 function finishTest()
 {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-      getService(Components.interfaces.nsIPrefBranch);
+    var prefs = SpecialPowers.wrap(Components)
+                             .classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
     prefs.setBoolPref("network.jar.open-unsafe-types", false);
 
   if (gNumPokes == 0) {
@@ -228,9 +228,9 @@ function finishTest()
 
 function startTests()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-    getService(Components.interfaces.nsIPrefBranch);
+  var prefs = SpecialPowers.wrap(Components)
+                           .classes["@mozilla.org/preferences-service;1"]
+                           .getService(Components.interfaces.nsIPrefBranch);
   gPrefValue = prefs.getBoolPref("network.jar.open-unsafe-types");
 }
 
diff --git a/docshell/test/test_bug509055.html b/docshell/test/test_bug509055.html
index 77ddc3a9ef0c..d31ce4819bea 100644
--- a/docshell/test/test_bug509055.html
+++ b/docshell/test/test_bug509055.html
@@ -41,8 +41,6 @@ function onChildLoad(e) {
 }
 
 function runTest() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
   var popup = window.open("file_bug509055.html", "popup 0",
                            "height=200,width=200,location=yes," +
                            "menubar=yes,status=yes,toolbar=yes,dependent=yes");
@@ -72,9 +70,10 @@ function runTest() {
   dump('Got second hashchange.  Spinning event loop.\n');
   yield;
 
-  var sh = popup.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                .getInterface(Components.interfaces.nsIWebNavigation)
-                .sessionHistory;
+  var sh = SpecialPowers.wrap(popup)
+                        .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                        .getInterface(Components.interfaces.nsIWebNavigation)
+                        .sessionHistory;
 
   // Get the title of the inner popup's current SHEntry 
   var sheTitle = sh.getEntryAtIndex(sh.index, false).title;
diff --git a/docshell/test/test_bug529119-1.html b/docshell/test/test_bug529119-1.html
index c5ea08693e25..8db0df19b1de 100644
--- a/docshell/test/test_bug529119-1.html
+++ b/docshell/test/test_bug529119-1.html
@@ -43,7 +43,6 @@ function pollForPage(f, w)
 
 function windowLoaded()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   switch (phase)
   {
     case 0:
@@ -57,18 +56,16 @@ function windowLoaded()
       pollForPage(function(succeeded) {
         ok(succeeded, "Waiting for error page succeeded");
         
-        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         /* 3. now, while we are on the error page, try to reload it, actually 
            click the "Try Again" button */
-        w.location.reload();
+        SpecialPowers.wrap(w).location.reload();
 
         pollForPage(function(succeeded) {
           ok(succeeded, "Waiting for error page succeeded");
           
-          netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
           /* 4-finish, check we are still on the error page */
-          is(w.location.href, faultyURL, "Is on an error page");
-          isnot(w.location.href, workingURL, "Is not on the previous page");
+          is(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
+          isnot(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
           is(gotWrongPageOnTryAgainClick, false, 
             "Must not get www.example.com page on reload of an error page");
           w.close();
diff --git a/docshell/test/test_bug529119-2.html b/docshell/test/test_bug529119-2.html
index f73aff68664b..67d303075852 100644
--- a/docshell/test/test_bug529119-2.html
+++ b/docshell/test/test_bug529119-2.html
@@ -42,8 +42,6 @@ function pollForPage(expectErrorPage, f, w)
 
 function windowLoaded()
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
   /* 2. We have successfully loaded a page, now go to a faulty URL */
   // XXX The test fails when we change the location synchronously 
   window.setTimeout(function() {
@@ -52,11 +50,9 @@ function windowLoaded()
 
   pollForPage(true, function(succeeded) {
     ok(succeeded, "Waiting for error page succeeded");
-    
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     /* 3. now, while we are on the error page, navigate back */
     try {
-      w.back();
+      SpecialPowers.wrap(w).back();
     }
     catch(ex) {
       ok(false, "w.back() threw " + ex);
@@ -64,11 +60,9 @@ function windowLoaded()
 
     pollForPage(false, function(succeeded) {
       ok(succeeded, "Waiting for original page succeeded");
-      
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       /* 4-finish, check we are back at the original page */
-      isnot(w.location.href, faultyURL, "Is on an error page");
-      is(w.location.href, workingURL, "Is not on the previous page");
+      isnot(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
+      is(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
       w.close();
       SimpleTest.finish();
     }, w);
diff --git a/dom/tests/mochitest/bugs/test_bug317448.html b/dom/tests/mochitest/bugs/test_bug317448.html
index 32013041b100..859f0276a8bd 100644
--- a/dom/tests/mochitest/bugs/test_bug317448.html
+++ b/dom/tests/mochitest/bugs/test_bug317448.html
@@ -21,16 +21,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=317448
 var x = new XMLHttpRequest();
 x.open("GET", document.location.href);
 x.send("");
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-is(SpecialPowers.call_Instanceof(x, Components.interfaces.nsIInterfaceRequestor),
+is(x instanceof Components.interfaces.nsIInterfaceRequestor,
    true, "Must be interface requestor");
 
 var count = {};
-var interfaces = x.
+var interfaces = SpecialPowers.wrap(x).
                  QueryInterface(Components.interfaces.nsIClassInfo).
                  getInterfaces(count).
                  map(function(id) {
-                            return Components.interfacesByID[id].toString();
+                            id = SpecialPowers.wrap(id);
+                            return SpecialPowers.wrap(Components).interfacesByID[id].toString();
                      });
 isnot(interfaces.indexOf("nsIInterfaceRequestor"), "-1",
       "Must have interface requestor classinfo");
diff --git a/editor/libeditor/html/tests/test_bug520189.html b/editor/libeditor/html/tests/test_bug520189.html
index c57f6ab8cf39..4cb01413f0c1 100644
--- a/editor/libeditor/html/tests/test_bug520189.html
+++ b/editor/libeditor/html/tests/test_bug520189.html
@@ -550,7 +550,8 @@ function doNextTest() {
 
 function getLoadContext() {
   const Ci = Components.interfaces;
-  return window.QueryInterface(Ci.nsIInterfaceRequestor)
+  return SpecialPowers.wrap(window)
+               .QueryInterface(Ci.nsIInterfaceRequestor)
                .getInterface(Ci.nsIWebNavigation)
                .QueryInterface(Ci.nsILoadContext);
 }
diff --git a/gfx/tests/mochitest/test_acceleration.html b/gfx/tests/mochitest/test_acceleration.html
index fc9e654f2f57..d60fb9b184c0 100644
--- a/gfx/tests/mochitest/test_acceleration.html
+++ b/gfx/tests/mochitest/test_acceleration.html
@@ -20,11 +20,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=627498
 // Make sure that acceleration is enabled/disabled the way we expect it to be
 // based on platform.
 
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+var importObj = {};
+SpecialPowers.wrap(Components).utils.import("resource://gre/modules/Services.jsm",
+                                            importObj);
+var Services = SpecialPowers.wrap(importObj).Services;
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var Cc = Components.classes;
+var Cc = SpecialPowers.wrap(Components).classes;
 var Ci = Components.interfaces;
 
 var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
diff --git a/layout/base/tests/test_bug450930.xhtml b/layout/base/tests/test_bug450930.xhtml
index 24560b508443..5dada0537101 100644
--- a/layout/base/tests/test_bug450930.xhtml
+++ b/layout/base/tests/test_bug450930.xhtml
@@ -126,26 +126,21 @@ function runTest1() {
 function runTest2(frameID, containerID) {
   // test reporting of painting in subdocuments
   var fired = 0;
-  var gotSubdocPrivileged = false;
-  var gotSubdocNonprivileged = false;
+  var gotSubdoc = false;
   var iframe = document.getElementById(frameID);
   var container = document.getElementById(containerID);
 
   function listener(event) {
     if (checkGotSubdoc(event.clientRects, container))
-      gotSubdocNonprivileged = true;
+      gotSubdoc = true;
 
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    if (checkGotSubdoc(event.clientRects, container))
-      gotSubdocPrivileged = true;
     if (++fired == 1)
       setTimeout(check, 100);
   }
 
   function check() {
     is(fired, 1, "Wrong event count (" + frameID + ")");
-    ok(gotSubdocPrivileged, "Didn't get subdoc invalidation while we were privileged (" + frameID + ")");
-    ok(!gotSubdocNonprivileged, "Got subdoc invalidation while we were not privileged (" + frameID + ")");
+    ok(!gotSubdoc, "Got subdoc invalidation (" + frameID + ")");
     window.removeEventListener("MozAfterPaint", listener, false);
     runNext();
   }
@@ -168,7 +163,6 @@ function runTest3() {
   var iframe = document.getElementById("iframe");
 
   function listener(event) {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     if (checkGotSubdoc(event.clientRects, iframe))
       gotScrolledOutInMainDoc = true;
   }
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
index 1dead1c345fc..49bc0037e819 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
@@ -159,13 +159,11 @@ function todoSecurityState(expectedState, message)
 
 function isSecurityState(expectedState, message, test)
 {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
   if (!test)
     test = ok;
 
   // Quit nasty but working :)
-  var ui = window
+  var ui = SpecialPowers.wrap(window)
     .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
     .getInterface(Components.interfaces.nsIWebNavigation)
     .QueryInterface(Components.interfaces.nsIDocShell)