Bug 1358010 - Skip vr mochitests when running on release and non-Windows platforms; r=kip

MozReview-Commit-ID: 7TeTXyIfrh

--HG--
extra : rebase_source : 2ac584213841fa7cd47c5678b4d80fbb3bf53b8b

dom/vr/test/mochitest.ini

@@ -6,7 +6,9 @@ support-files =
   WebVRHelpers.js
 
 [test_vrDisplay_exitPresent.html]
+skip-if = (os != "win" && release_or_beta) # Enable Linux after Bug 1310655
 [test_vrDisplay_getFrameData.html]
+skip-if = (os != "win" && release_or_beta) # Enable Linux after Bug 1310655
 [test_vrDisplay_onvrdisplaydeactivate_crosscontent.html]
 skip-if = true
 [test_vrDisplay_requestPresent.html]

dom/vr/test/runVRTest.js

@@ -1,6 +1,5 @@
 function runVRTest(callback) {
-  SpecialPowers.pushPrefEnv({"set" : [["dom.vr.enabled", true],
-                                      ["dom.vr.puppet.enabled", true],
+  SpecialPowers.pushPrefEnv({"set" : [["dom.vr.puppet.enabled", true],
                                       ["dom.vr.require-gesture", false],
                                       ["dom.vr.test.enabled", true]]},
   () => {