Remove the easy-to-remove uses of enablePrivilege in layout/base/tests/. (Bug 788603) r=roc

layout/base/tests/bidi_numeral_test.js

@@ -32,14 +32,10 @@ RemoteCanvas.prototype.remotePageLoaded = function(callback) {
 };
 
 function bidiNumeral(val) {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                        .getService(Components.interfaces.nsIPrefBranch);
-
   if (typeof val == "undefined")
-    return prefs.getIntPref("bidi.numeral");
+    return SpecialPowers.getIntPref("bidi.numeral");
   else
-    prefs.setIntPref("bidi.numeral", val);
+    SpecialPowers.setIntPref("bidi.numeral", val);
 }
 
 var bidiNumeralDefault = bidiNumeral();

layout/base/tests/bug613807-1.html

@@ -44,8 +44,7 @@
     var area = document.getElementById('t');
     area.focus();
 
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    const nsIDOMWindowUtils = Components.interfaces.nsIDOMWindowUtils;
+    var domWindowUtils = SpecialPowers.getDOMWindowUtils(window);
 
     // start composition
     synthesizeComposition({ type: "compositionstart" });
@@ -56,7 +55,7 @@
       { composition:
         { string: "\u306D",
           clauses: [
-            { length: 1, attr: nsIDOMWindowUtils.COMPOSITION_ATTR_RAWINPUT }
+            { length: 1, attr: domWindowUtils.COMPOSITION_ATTR_RAWINPUT }
           ]
         },
         caret: { start: 1, length: 0 }
@@ -66,7 +65,7 @@
       { composition:
         { string: "\u306D\u3053",
           clauses: [
-            { length: 2, attr: nsIDOMWindowUtils.COMPOSITION_ATTR_RAWINPUT }
+            { length: 2, attr: domWindowUtils.COMPOSITION_ATTR_RAWINPUT }
           ]
         },
         caret: { start: 2, length: 0 }
@@ -78,7 +77,7 @@
       { composition:
         { string: "\u732B",
           clauses: [
-            { length: 1, attr: nsIDOMWindowUtils.COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT }
+            { length: 1, attr: domWindowUtils.COMPOSITION_ATTR_SELECTEDCONVERTEDTEXT }
           ]
         },
         caret: { start: 1, length: 0 }

layout/base/tests/test_bug423523.html

@@ -56,16 +56,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=423523
   }
   
   function sendMouseClick() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     var rect=document.getElementById('div1').getBoundingClientRect();
-    var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                   getInterface(Components.interfaces.nsIDOMWindowUtils);
+    var utils = SpecialPowers.getDOMWindowUtils(window);
     utils.sendMouseEvent('mousedown', rect.left+1, rect.top+1, 0, 1, 0);
     utils.sendMouseEvent('mouseup', rect.left+1, rect.top+1, 0, 1, 0);
   }
  
   function runtests() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     sendMouseClick();
     window.getSelection().collapse(document.getElementById("div1").firstChild, 0);
     ok(divIsFocused(), "Div should be focused [0].");

layout/base/tests/test_bug558663.html

@@ -22,7 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558663
 /** Test for Bug 558663 **/
 
 SimpleTest.waitForExplicitFinish();
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 window.addEventListener("load", runTest, false);
 
 function checkSnapshots(s1, s2, shouldBeEqual, testName) {

layout/base/tests/test_bug582771.html

@@ -34,26 +34,20 @@ var d1mousemovecount = 0;
 var d2mousemovecount = 0;
 
 function sendMouseMove(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mousemove', rect.left + 5, rect.top + 5, 0, 0, 0);
 }
 
 function sendMouseDown(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mousedown', rect.left + 5, rect.top + 5, 0, 1, 0);
 }
 
 function sendMouseUp(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mouseup', rect.left + 5, rect.top + 5, 0, 1, 0);
 }
 

layout/base/tests/test_bug603550.html

@@ -30,34 +30,25 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=603550
 SimpleTest.waitForExplicitFinish();
 
 function sendMouseMoveFaraway(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mousemove', rect.left + 5000, rect.top + 5000, 0, 0, 0);
 }
 
 function sendMouseDown(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mousedown', rect.left + 5, rect.top + 5, 0, 1, 0);
 }
 
 function sendMouseUp(el) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var rect = el.getBoundingClientRect();
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                    .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.sendMouseEvent('mouseup', rect.left + 5, rect.top + 5, 0, 1, 0);
 }
 
 function fireEvent(target, event) {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-  var utils =
-    window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-           getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.dispatchDOMEventViaPresShell(target, event, true);
 }
 

layout/base/tests/test_flush_on_paint.html

@@ -44,9 +44,7 @@ function checkDone() {
     return;
   }
 
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                 getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   is(plugin.getWidthAtLastPaint(), utils.screenPixelsPerCSSPixel*expectedWidth,
      "Check that we set width before painting");
 

layout/base/tests/test_image_layers.html

@@ -19,9 +19,7 @@ var lastPaintCount;
 function changeImage() {
   lastPaintCount = window.mozPaintCount;
   
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                 getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   utils.checkAndClearPaintedState(image);
 
   image.src = "./image_rrgg-256x256.png";
@@ -34,9 +32,7 @@ function checkDone() {
     return;
   }
 
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                 getInterface(Components.interfaces.nsIDOMWindowUtils);
+  var utils = SpecialPowers.getDOMWindowUtils(window);
   ok(!utils.checkAndClearPaintedState(image), "Should not paint any thebes layers for our image!");
   SimpleTest.finish();
 }

layout/base/tests/test_reftests_with_caret.html

@@ -84,13 +84,10 @@ function refTest(test,ref) {
 
 var caretBlinkTime = null;
 function endTest() {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                        .getService(Components.interfaces.nsIPrefBranch);
   if (caretBlinkTime !== null) {
-    prefs.setIntPref("ui.caretBlinkTime", caretBlinkTime);
+    SpecialPowers.setIntPref("ui.caretBlinkTime", caretBlinkTime);
   } else {
-    prefs.clearUserPref("ui.caretBlinkTime");
+    SpecialPowers.clearUserPref("ui.caretBlinkTime");
   }
 
   // finish(), yet let the test actually end first, to be safe.
@@ -163,13 +160,10 @@ function nextTest() {
 }
 function runTests() {
   try {
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService(Components.interfaces.nsIPrefBranch);
     try {
-      caretBlinkTime = prefs.getIntPref("ui.caretBlinkTime");
+      caretBlinkTime = SpecialPowers.getIntPref("ui.caretBlinkTime");
     } catch (e) {}
-    prefs.setIntPref("ui.caretBlinkTime", -1);
+    SpecialPowers.setIntPref("ui.caretBlinkTime", -1);
 
     nextTest();
   } catch(e) {