From 605ce41d5ae200d1b544f2eec0764239b8f5b0cc Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 27 Sep 2013 18:28:43 -0400
Subject: [PATCH] Backed out changeset 356ba083bb5f (bug 918604) for frequent
 OSX test_window_bar.html timeouts. CLOSED TREE

---
 content/html/document/test/test_viewport.html |  1 +
 content/media/test/file_access_controls.html  | 17 +++----
 content/media/test/test_access_control.html   | 17 +------
 content/media/test/test_delay_load.html       |  4 ++
 dom/tests/mochitest/bugs/test_bug581072.html  |  4 +-
 .../dom-level0/innerWidthHeight_script.html   |  6 ++-
 .../test_innerWidthHeight_script.html         |  6 +--
 .../general/test_clipboard_events.html        | 44 +++++++++++++++++--
 .../storageevent/interOriginFrame.js          |  3 +-
 .../storageevent/interOriginTest2.js          |  5 ++-
 editor/composer/test/test_bug384147.html      |  2 +
 .../libeditor/html/tests/test_bug414526.html  |  1 +
 .../libeditor/html/tests/test_bug455992.html  |  3 +-
 .../libeditor/html/tests/test_bug456244.html  |  3 +-
 .../libeditor/html/tests/test_bug484181.html  |  6 ++-
 .../libeditor/html/tests/test_bug487524.html  |  3 +-
 .../libeditor/html/tests/test_bug489202.xul   |  5 ++-
 embedding/test/test_window_open_units.html    | 14 +++++-
 image/test/mochitest/test_bug497665.html      |  2 +
 image/test/mochitest/test_bug614392.html      |  9 ++--
 image/test/mochitest/test_staticClone.html    |  1 +
 .../tests/mochitest/bugs/test_bug484111.html  |  9 ++--
 testing/mochitest/tests/test_bug362788.xhtml  |  5 ++-
 .../tests/test_sanityEventUtils.html          |  1 +
 24 files changed, 116 insertions(+), 55 deletions(-)

diff --git a/content/html/document/test/test_viewport.html b/content/html/document/test/test_viewport.html
index 2299bef3d37..a3f29e7e982 100644
--- a/content/html/document/test/test_viewport.html
+++ b/content/html/document/test/test_viewport.html
@@ -24,6 +24,7 @@ SimpleTest.waitForExplicitFinish();
 function testViewport() {
 
   /* We need to access the document headers, which are chrome-only. */
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   /* Grab Viewport Metadata from the document header. */
   var windowUtils = SpecialPowers.getDOMWindowUtils(window);
diff --git a/content/media/test/file_access_controls.html b/content/media/test/file_access_controls.html
index 90f7b4211fa..17ab07a5f10 100644
--- a/content/media/test/file_access_controls.html
+++ b/content/media/test/file_access_controls.html
@@ -78,11 +78,11 @@ var gVideo = null;
 var gTestedRemoved = false;
 
 function eventHandler(event) {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   //dump((gTestNum - 1) + ": " + event.type + "\n");
   var video = event.target;
-  opener.postMessage({"result": (event.type == video.expectedResult),
-                      "message":  video.testDescription + (gTestedRemoved ? " (element not in document)" : " (element in document)")},
-                     "http://mochi.test:8888");
+  opener.is(event.type, video.expectedResult, video.testDescription +
+    (gTestedRemoved ? " (element not in document)" : " (element in document)"));
   // Make sure any extra events cause an error
   video.expectedResult = "<none>";
   nextTest();
@@ -97,9 +97,10 @@ function createVideo() {
 }
 
 function load() {
-  opener.postMessage({"result": (window.location.href == "http://example.org/tests/content/media/test/file_access_controls.html"),
-                      "message":  "We must be on a example.org:80"},
-                     "http://mochi.test:8888");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  opener.is(window.location.href,
+            "http://example.org/tests/content/media/test/file_access_controls.html",
+            "We must be on a example.org:80");
 
   nextTest();
 }
@@ -124,7 +125,7 @@ function nextTest() {
     gVideo.parentNode.removeChild(gVideo);
 
   gVideo = null;
-  SpecialPowers.forceGC();  
+  opener.SpecialPowers.forceGC();  
   
   gVideo = createVideo();
   gVideo.expectedResult = gTests[gTestNum].result;
@@ -147,7 +148,7 @@ function nextTest() {
 }
 
 function done() {
-  opener.postMessage({"done": "true"}, "http://mochi.test:8888");
+  opener.done();
 }
 
 </script>
diff --git a/content/media/test/test_access_control.html b/content/media/test/test_access_control.html
index 6729c4aa48f..8e4547591c2 100644
--- a/content/media/test/test_access_control.html
+++ b/content/media/test/test_access_control.html
@@ -30,22 +30,7 @@ function done() {
 
 addLoadEvent(run);
 SimpleTest.waitForExplicitFinish();
-
-
-window.addEventListener("message", receiveMessage, false);
-
-function receiveMessage(event)
-{
-  if (event.origin !== "http://example.org") {
-    ok(false, "Received message from wrong domain");
-    return;
-  }
-
-  if (event.data.done == "true")
-    return done();
-
-  ok(event.data.result, event.data.message);
-}
+  
 </script>
 </pre>
 </body>
diff --git a/content/media/test/test_delay_load.html b/content/media/test/test_delay_load.html
index 05ad33961f8..80cd91e1c70 100644
--- a/content/media/test/test_delay_load.html
+++ b/content/media/test/test_delay_load.html
@@ -34,6 +34,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=479711
          v._name + ":" + v.id + " is not ready before onload fired (" + v.readyState + ")");
     }
 
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     for (i=0; i<testWindows.length; ++i) {
       testWindows[i].close();
     }
@@ -93,6 +94,9 @@ document.body.appendChild(v);
 v = createVideo(test.name, test.type, "3");
 v.load();
 
+// Load and move to another document.
+netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
 // Open a new window for the following test. We open it here instead of in
 // the event handler to ensure that our document load event doesn't fire while
 // window.open is spinning the event loop.
diff --git a/dom/tests/mochitest/bugs/test_bug581072.html b/dom/tests/mochitest/bugs/test_bug581072.html
index 4b94eb8ab37..7fd726c240b 100644
--- a/dom/tests/mochitest/bugs/test_bug581072.html
+++ b/dom/tests/mochitest/bugs/test_bug581072.html
@@ -27,7 +27,9 @@ setTimeout(function() { longTimerFired = true; }, 3600000);
 
 // Trigger suspend and resume timeouts
 (function() {
-  var utils = SpecialPowers.getDOMWindowUtils(window);
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
   utils.suspendTimeouts();  
   utils.resumeTimeouts();  
 })()
diff --git a/dom/tests/mochitest/dom-level0/innerWidthHeight_script.html b/dom/tests/mochitest/dom-level0/innerWidthHeight_script.html
index df29c2ea4e5..7483007ff4e 100644
--- a/dom/tests/mochitest/dom-level0/innerWidthHeight_script.html
+++ b/dom/tests/mochitest/dom-level0/innerWidthHeight_script.html
@@ -6,9 +6,13 @@
   <script class="testbody" type="text/javascript">
   function runSubTest()
   {
+    // get ability to set innerWidth and height without setting a pref
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
     // Firefox doesn't support the metaviewport tag on desktop, so we force
     // css viewport here using nsIDomWindowUtils
-    var cwu = SpecialPowers.getDOMWindowUtils(window);
+    var cwu = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+                     getInterface(Components.interfaces.nsIDOMWindowUtils);
     cwu.setCSSViewport(320, 320);
 
     var oldWidth = window.innerWidth;
diff --git a/dom/tests/mochitest/dom-level0/test_innerWidthHeight_script.html b/dom/tests/mochitest/dom-level0/test_innerWidthHeight_script.html
index 7d93ef070fc..3069020a7ee 100644
--- a/dom/tests/mochitest/dom-level0/test_innerWidthHeight_script.html
+++ b/dom/tests/mochitest/dom-level0/test_innerWidthHeight_script.html
@@ -9,7 +9,7 @@
     so instead We load it in a separate window.
   -->
 </head>
-<body onload="startTest()">
+<body onload="runTest()">
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
   var newWin = null;
@@ -21,10 +21,6 @@
     newWin.close();
     SimpleTest.finish();
   }
-
-  function startTest() {
-    SpecialPowers.pushPrefEnv({"set": [["dom.disable_window_move_resize", false]]}, runTest);
-  }
   </script>
 </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_clipboard_events.html b/dom/tests/mochitest/general/test_clipboard_events.html
index e66e30c975b..ab720e48cdd 100644
--- a/dom/tests/mochitest/general/test_clipboard_events.html
+++ b/dom/tests/mochitest/general/test_clipboard_events.html
@@ -19,6 +19,9 @@
 <pre id="test">
 <script class="testbody" type="text/javascript;version=1.7">
 
+// Enable full privledges for clipboard read/write operations.
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+
 var content = document.getElementById("content");
 var contentInput = document.getElementById("content-input");
 var clipboardInitialValue = "empty";
@@ -28,7 +31,6 @@ var clipboardInitialValue = "empty";
 // test run don't cause a false-positive test.
 var cb_text = "empty_" + Math.random();
 setClipboardText(cb_text);
-
 is(getClipboardText(), cb_text, "set/get clipboard text failed");
 
 // Some test functions need to be run with delays.
@@ -95,13 +97,49 @@ SimpleTest.waitForExplicitFinish();
 window.focus();
 
 function getLoadContext() {
-  return SpecialPowers.wrap(window).QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
+  return window.QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
                .getInterface(SpecialPowers.Ci.nsIWebNavigation)
                .QueryInterface(SpecialPowers.Ci.nsILoadContext);
 }
 
 function getClipboardText() {
-  return SpecialPowers.getClipboardData("text/unicode");
+  var trans = SpecialPowers.Cc["@mozilla.org/widget/transferable;1"]
+    .createInstance();
+  trans = trans.QueryInterface(SpecialPowers.Ci.nsITransferable);
+  trans.init(getLoadContext());
+  trans.addDataFlavor("text/unicode");
+
+  var clipboard = SpecialPowers.Cc["@mozilla.org/widget/clipboard;1"]
+    .getService();
+  clipboard = clipboard.QueryInterface(SpecialPowers.Ci.nsIClipboard);
+  clipboard.getData(trans, clipboard.kGlobalClipboard);
+
+  var str = new Object();
+  var strLen = new Object();
+
+  try {
+    trans.getTransferData("text/unicode", str, strLen);
+  } catch(e) {
+    // NS_ERROR_FAILURE will occur if the transferable object has no
+    // text/unicode data in it.  In that case, it's not an error:
+    if (e instanceof SpecialPowers.Ci.nsIXPCException &&
+      e.result == SpecialPowers.Cr.NS_ERROR_FAILURE) {
+      return null;
+    } else {
+      // if we don't know how to handle it then rethrow
+      throw e;
+    }
+  }
+
+  if (!str) return null;
+
+  str = str.value.QueryInterface(SpecialPowers.Ci.nsISupportsString);
+  if (!str) return null;
+
+  str = str.data.substring(0, strLen.value / 2);
+  if (!str) return null;
+
+  return str;
 }
 
 
diff --git a/dom/tests/mochitest/storageevent/interOriginFrame.js b/dom/tests/mochitest/storageevent/interOriginFrame.js
index b1180c90811..b01cd2d4995 100644
--- a/dom/tests/mochitest/storageevent/interOriginFrame.js
+++ b/dom/tests/mochitest/storageevent/interOriginFrame.js
@@ -1,6 +1,7 @@
 function postMsg(message)
 {
-  var l = SpecialPowers.wrap(parent.window.location);
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var l = parent.window.location;
   parent.postMessage(message, l.protocol + "//" + l.host);
 }
 
diff --git a/dom/tests/mochitest/storageevent/interOriginTest2.js b/dom/tests/mochitest/storageevent/interOriginTest2.js
index 73b04b0fdd3..e7ecdce5d54 100644
--- a/dom/tests/mochitest/storageevent/interOriginTest2.js
+++ b/dom/tests/mochitest/storageevent/interOriginTest2.js
@@ -15,6 +15,7 @@ window.addEventListener("message", onMessageReceived, false);
 
 function onMessageReceived(event)
 {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   switch (event.data)
   {
@@ -31,8 +32,8 @@ function onMessageReceived(event)
         masterFrame.postMessage("step", masterFrameOrigin);
       else if (slaveFrame)
         slaveFrame.postMessage("step", slaveFrameOrigin);
-      else if (SpecialPowers.wrap(masterFrame).slaveFrame)
-        SpecialPowers.wrap(masterFrame).slaveFrame.postMessage("step", slaveFrameOrigin);
+      else if (masterFrame.slaveFrame)
+        masterFrame.slaveFrame.postMessage("step", slaveFrameOrigin);
       callMasterFrame = !callMasterFrame;
       break;
 
diff --git a/editor/composer/test/test_bug384147.html b/editor/composer/test/test_bug384147.html
index 35f0e533ed8..d6604c3adb8 100644
--- a/editor/composer/test/test_bug384147.html
+++ b/editor/composer/test/test_bug384147.html
@@ -22,6 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=384147
 
 SimpleTest.waitForExplicitFinish();
 
+// netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+
 var editor = document.getElementById("editor");
 
 editor.innerHTML = "<ol><li>Item 1</li><li>Item 2</li><ol><li>Item 3</li></ol></ol><ul><li>Item 4</li><li>Item 5</li></ul>";
diff --git a/editor/libeditor/html/tests/test_bug414526.html b/editor/libeditor/html/tests/test_bug414526.html
index 4b6ede11cbe..499ee7d10c1 100644
--- a/editor/libeditor/html/tests/test_bug414526.html
+++ b/editor/libeditor/html/tests/test_bug414526.html
@@ -20,6 +20,7 @@ SimpleTest.waitForFocus(runTests);
 
 function runTests()
 {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   var container = document.getElementById("display");
 
diff --git a/editor/libeditor/html/tests/test_bug455992.html b/editor/libeditor/html/tests/test_bug455992.html
index daf362acfb7..d4f4be27ba8 100644
--- a/editor/libeditor/html/tests/test_bug455992.html
+++ b/editor/libeditor/html/tests/test_bug455992.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html><head>
 <title>Test for bug 455992</title>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<style src="/tests/SimpleTest/test.css" type="text/css"></style>
 <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
 
 <script class="testbody" type="application/javascript">
 function runTest() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   function select(id) {
     var e = document.getElementById(id);
diff --git a/editor/libeditor/html/tests/test_bug456244.html b/editor/libeditor/html/tests/test_bug456244.html
index 03cc2c9e367..d85970f3f53 100644
--- a/editor/libeditor/html/tests/test_bug456244.html
+++ b/editor/libeditor/html/tests/test_bug456244.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html><head>
 <title>Test for bug 456244</title>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<style src="/tests/SimpleTest/test.css" type="text/css"></style>
 <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
 
 <script class="testbody" type="application/javascript">
 function runTest() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   function select(id) {
     var e = document.getElementById(id);
diff --git a/editor/libeditor/html/tests/test_bug484181.html b/editor/libeditor/html/tests/test_bug484181.html
index fbdb7cd36b7..c188fd0527a 100644
--- a/editor/libeditor/html/tests/test_bug484181.html
+++ b/editor/libeditor/html/tests/test_bug484181.html
@@ -26,9 +26,9 @@ addLoadEvent(runTest);
 var gMisspeltWords;
 
 function getEditor() {
-  var Ci = SpecialPowers.Ci;
+  var Ci = Components.interfaces;
   var win = window;
-  var editingSession = SpecialPowers.wrap(win).QueryInterface(Ci.nsIInterfaceRequestor)
+  var editingSession = win.QueryInterface(Ci.nsIInterfaceRequestor)
                           .getInterface(Ci.nsIWebNavigation)
                           .QueryInterface(Ci.nsIInterfaceRequestor)
                           .getInterface(Ci.nsIEditingSession);
@@ -42,6 +42,7 @@ function getSpellCheckSelection() {
 }
 
 function append(str) {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   var edit = document.getElementById("edit");
   var editor = getEditor();
@@ -75,6 +76,7 @@ function runTest() {
 }
 
 function isSpellingCheckOk() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   var sel = getSpellCheckSelection();
   var numWords = sel.rangeCount;
diff --git a/editor/libeditor/html/tests/test_bug487524.html b/editor/libeditor/html/tests/test_bug487524.html
index d4972ba91bd..8f4b83b812e 100644
--- a/editor/libeditor/html/tests/test_bug487524.html
+++ b/editor/libeditor/html/tests/test_bug487524.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html><head>
 <title>Test for bug 487524</title>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<style src="/tests/SimpleTest/test.css" type="text/css"></style>
 <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
 
 <script class="testbody" type="application/javascript">
 function runTest() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   function setupIframe(e,html,focus_id) {
     var doc = e.contentDocument;
diff --git a/editor/libeditor/html/tests/test_bug489202.xul b/editor/libeditor/html/tests/test_bug489202.xul
index 30e2a730d6d..5cedbb9f951 100644
--- a/editor/libeditor/html/tests/test_bug489202.xul
+++ b/editor/libeditor/html/tests/test_bug489202.xul
@@ -28,7 +28,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=489202
   </body>
   <script class="testbody" type="application/javascript">
   <![CDATA[
-  var utils = SpecialPowers.getDOMWindowUtils(window);
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindowUtils);
   var Cc = Components.classes;
   var Ci = Components.interfaces;
 
@@ -39,6 +40,8 @@ function getLoadContext() {
 }
 
 function runTest() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
   var trans = Cc["@mozilla.org/widget/transferable;1"]
       .createInstance(Ci.nsITransferable);
   trans.init(getLoadContext());
diff --git a/embedding/test/test_window_open_units.html b/embedding/test/test_window_open_units.html
index a27a6196648..3bc49748bf6 100644
--- a/embedding/test/test_window_open_units.html
+++ b/embedding/test/test_window_open_units.html
@@ -12,10 +12,19 @@
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+var viewer =
+  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+               .getInterface(Components.interfaces.nsIWebNavigation)
+               .QueryInterface(Components.interfaces.nsIDocShell)
+               .contentViewer
+               .QueryInterface(Components.interfaces.nsIMarkupDocumentViewer);
+
 SimpleTest.waitForExplicitFinish();
 
 SimpleTest.waitForFocus(function() {
-  SpecialPowers.setFullZoom(window, 2);
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  viewer.fullZoom = 2;
 
   var p = window;
   var w = window.open("about:blank", "", "width=200,height=100");
@@ -25,7 +34,8 @@ SimpleTest.waitForFocus(function() {
     ok(w.innerHeight <= 202 && w.innerHeight >= 198,
        "height (" + w.innerHeight + ") should be around twice what was requested (100)");
 
-    SpecialPowers.setFullZoom(window, 1);
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    viewer.fullZoom = 1;
     w.close();
     SimpleTest.finish();
   }, w, true);
diff --git a/image/test/mochitest/test_bug497665.html b/image/test/mochitest/test_bug497665.html
index 3a72c0912bf..0cfc76efa7d 100644
--- a/image/test/mochitest/test_bug497665.html
+++ b/image/test/mochitest/test_bug497665.html
@@ -21,6 +21,8 @@ SimpleTest.waitForExplicitFinish();
 
 function checkFirst()
 {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
   var iframeelem = document.getElementById('test-iframe');
   var canvas = document.getElementById('canvas');
   var ctx = canvas.getContext('2d');
diff --git a/image/test/mochitest/test_bug614392.html b/image/test/mochitest/test_bug614392.html
index 4cec54a05d6..5b6acfa35a1 100644
--- a/image/test/mochitest/test_bug614392.html
+++ b/image/test/mochitest/test_bug614392.html
@@ -21,17 +21,18 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=614392
 SimpleTest.waitForExplicitFinish();
 
 window.onload = function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var img = SpecialPowers.wrap(document.getElementsByTagName("img")[0]);
   var container = img
-      .QueryInterface(SpecialPowers.Ci.nsIImageLoadingContent)
-      .getRequest(SpecialPowers.Ci.nsIImageLoadingContent.CURRENT_REQUEST)
+      .QueryInterface(Components.interfaces.nsIImageLoadingContent)
+      .getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST)
       .image;
 
   container.animationMode =
-      SpecialPowers.Ci.imgIContainer.kDontAnimMode;
+      Components.interfaces.imgIContainer.kDontAnimMode;
 
   is(container.animationMode,
-     SpecialPowers.Ci.imgIContainer.kDontAnimMode,
+     Components.interfaces.imgIContainer.kDontAnimMode,
      "yay, our animationMode tweak took effect (and we didn't crash!)");
 
   SimpleTest.finish();
diff --git a/image/test/mochitest/test_staticClone.html b/image/test/mochitest/test_staticClone.html
index 9aafec31ed1..fde8dcab136 100644
--- a/image/test/mochitest/test_staticClone.html
+++ b/image/test/mochitest/test_staticClone.html
@@ -22,6 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=878037
 SimpleTest.waitForExplicitFinish();
 
 window.onload = function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var img = document.getElementById("animated");
   var content =  img.QueryInterface(Components.interfaces.nsIImageLoadingContent);
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
index 7b36d12c8cb..ff5b6a03bf5 100644
--- a/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
@@ -22,12 +22,13 @@ badCertListener.prototype = {
   },
 
   QueryInterface: function(aIID) {
-    if (aIID.equals(SpecialPowers.Ci.nsIBadCertListener2) ||
-        aIID.equals(SpecialPowers.Ci.nsIInterfaceRequestor) ||
-        aIID.equals(SpecialPowers.Ci.nsISupports))
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (aIID.equals(Components.interfaces.nsIBadCertListener2) ||
+        aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        aIID.equals(Components.interfaces.nsISupports))
       return this;
 
-    throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
+    throw Components.results.NS_ERROR_NO_INTERFACE;
   },  
 
   notifyCertProblem: function(socketInfo, sslStatus, targetHost) {
diff --git a/testing/mochitest/tests/test_bug362788.xhtml b/testing/mochitest/tests/test_bug362788.xhtml
index 82a50ed74a7..338b09c3193 100644
--- a/testing/mochitest/tests/test_bug362788.xhtml
+++ b/testing/mochitest/tests/test_bug362788.xhtml
@@ -18,8 +18,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=362788
 <![CDATA[
 
 /** Test for Bug 362788 **/
-var Cc = SpecialPowers.Cc;
-var Ci = SpecialPowers.Ci;
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+var Cc = Components.classes;
+var Ci = Components.interfaces;
 var lib = Cc["@mozilla.org/url-classifier/jslib;1"]
           .getService().wrappedJSObject;
 ok(!!lib, "unable to get wrapped js object");
diff --git a/testing/mochitest/tests/test_sanityEventUtils.html b/testing/mochitest/tests/test_sanityEventUtils.html
index 69261a3f6bb..454f62c6b41 100644
--- a/testing/mochitest/tests/test_sanityEventUtils.html
+++ b/testing/mochitest/tests/test_sanityEventUtils.html
@@ -160,6 +160,7 @@ function starttest() {
 
       var querySelectedText = synthesizeQuerySelectedText();
       ok(querySelectedText, "query selected text event result is null");
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); //get permission to check members of querySelectedText
       ok(querySelectedText.succeeded, "query selected text event failed");
       is(querySelectedText.offset, 1,
          "query selected text event returns wrong offset");