Bug 841402 - Remove last piece of EnablePrivilege usage from CSP tests. r=bholley

content/base/test/file_CSP_frameancestors.sjs

@@ -21,13 +21,10 @@ function handleRequest(request, response)
   if (query['scriptedreport']) {
     // spit back a script that records that the page loaded
     response.setHeader("Content-Type", "text/javascript", false);
-    response.write('netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");');
     if (query['double'])
-      response.write('window.parent.parent.parent.frameLoaded("' + query['scriptedreport'] + '", ' +
-                                                       'window.location.toString());');
+      response.write('window.parent.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
     else
-      response.write('window.parent.parent.frameLoaded("' + query['scriptedreport'] + '", ' +
-                                                'window.location.toString());');
+      response.write('window.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
   } else if (query['internalframe']) {
     // spit back an internal iframe (one that might be blocked)
     response.setHeader("Content-Type", "text/html", false);

content/base/test/file_CSP_frameancestors_spec_compliant.sjs

@@ -21,13 +21,10 @@ function handleRequest(request, response)
   if (query['scriptedreport']) {
     // spit back a script that records that the page loaded
     response.setHeader("Content-Type", "text/javascript", false);
-    response.write('netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");');
     if (query['double'])
-      response.write('window.parent.parent.parent.frameLoaded("' + query['scriptedreport'] + '", ' +
-                                                       'window.location.toString());');
+      response.write('window.parent.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
     else
-      response.write('window.parent.parent.frameLoaded("' + query['scriptedreport'] + '", ' +
-                                                'window.location.toString());');
+      response.write('window.parent.parent.postMessage({call: "frameLoaded", testname: "' + query['scriptedreport'] + '", uri: "window.location.toString()"}, "*");');
   } else if (query['internalframe']) {
     // spit back an internal iframe (one that might be blocked)
     response.setHeader("Content-Type", "text/html", false);

content/base/test/test_CSP_frameancestors.html

@@ -113,6 +113,13 @@ var checkTestResults = function() {
   SimpleTest.finish();
 }
 
+window.addEventListener("message", receiveMessage, false);
+
+function receiveMessage(event) {
+  if (event.data.call && event.data.call == 'frameLoaded')
+    frameLoaded(event.data.testname, event.data.uri);
+}
+
 //////////////////////////////////////////////////////////////////////
 // set up and go
 window.examiner = new examiner();