Bug 864845 part 2. Make window.content chromeonly in nightly. r=mystor

MozReview-Commit-ID: Q7hTmngEgI

dom/tests/mochitest/bugs/test_bug440572.html

@@ -27,9 +27,8 @@ window.addEventListener("message", receiveMessage);
 
 function runtests()
 {
-  is(messages.size, 3, "received the right number of messages.");
+  is(messages.size, 2, "received the right number of messages.");
   is(messages.get("test"), "success", "test in frame failed.");
-  isnot(messages.get("content"), "success", "parent[\"content\"] should be the WebIDL property of Window.");
   isnot(messages.get("dump"), "success", "parent[\"dump\"] should be the WebIDL property of Window.");
 
   SimpleTest.finish();
@@ -40,8 +39,6 @@ SimpleTest.waitForExplicitFinish();
 <br>
 <iframe name="test" src="http://example.org:80/tests/dom/tests/mochitest/bugs/iframe_bug440572.html"></iframe>
 <br>
-<iframe name="content" src="http://example.org:80/tests/dom/tests/mochitest/bugs/iframe_bug440572.html"></iframe>
-<br>
 <iframe name="dump" src="http://example.org:80/tests/dom/tests/mochitest/bugs/iframe_bug440572.html"></iframe>
 </body>
 </html>

dom/webidl/Window.webidl

@@ -336,7 +336,11 @@ partial interface Window {
                                                                    optional DOMString options = "",
                                                                    any... extraArguments);
 
-  [Replaceable, Throws, NeedsCallerType] readonly attribute object? content;
+  [
+#ifdef NIGHTLY_BUILD
+   ChromeOnly,
+#endif
+   Replaceable, Throws, NeedsCallerType] readonly attribute object? content;
 
   [Throws, ChromeOnly] any getInterface(IID iid);
 

testing/talos/talos/pageloader/chrome/tscroll.js

@@ -113,7 +113,7 @@ function testScroll(target, stepSize, opt_reportFunc, opt_numSteps) {
   }
 
   function rAF(fn) {
-    return content.requestAnimationFrame(fn);
+    return win.requestAnimationFrame(fn);
   }
 
   function P_rAF() {