bug 862883 - Enable webrtc mochitests on FxAndroid. r=gcp

dom/media/tests/mochitest/head.js

@@ -111,31 +111,20 @@ function getUserMedia(constraints, onSuccess, onError) {
  *
  * @param {Function} aCallback
  *        Test method to execute after initialization
- * @param {Boolean} desktopSupportedOnly
- *        Specifies if the test currently is known to work on desktop only
  */
-function runTest(aCallback, desktopSupportedOnly) {
+function runTest(aCallback) {
   SimpleTest.waitForExplicitFinish();
-
-  // If this is a desktop supported test and we're on android or b2g,
-  // indicate that the test is not supported and skip the test
-  if(desktopSupportedOnly && (navigator.userAgent.indexOf('Android') > -1 ||
-     navigator.platform === '')) {
-    ok(true, navigator.userAgent + ' currently not supported');
-    SimpleTest.finish();
-  } else {
-    SpecialPowers.pushPrefEnv({'set': [
-        ['media.peerconnection.enabled', true],
-        ['media.navigator.permission.denied', true]]
-      }, function () {
-      try {
-        aCallback();
-      }
-      catch (err) {
-        unexpectedCallbackAndFinish(new Error)(err);
-      }
-    });
-  }
+  SpecialPowers.pushPrefEnv({'set': [
+    ['media.peerconnection.enabled', true],
+    ['media.navigator.permission.disabled', true]]
+  }, function () {
+    try {
+      aCallback();
+    }
+    catch (err) {
+      unexpectedCallbackAndFinish(new Error)(err);
+    }
+  });
 }
 
 /**

dom/media/tests/mochitest/test_getUserMedia_basicAudio.html

@@ -36,7 +36,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 
     }, unexpectedCallbackAndFinish(new Error));
 
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_basicVideo.html

@@ -36,7 +36,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 
     }, unexpectedCallbackAndFinish(new Error));
 
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html

@@ -35,7 +35,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_exceptions.html

@@ -77,7 +77,7 @@ runTest(function () {
   });
 
   SimpleTest.finish();
-}, false);
+});
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html

@@ -49,7 +49,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html

@@ -39,7 +39,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html

@@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html

@@ -39,7 +39,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html

@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       audioStreamPlayback.playMediaWithStreamStop(false, SimpleTest.finish,
         unexpectedCallbackAndFinish(new Error));
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html

@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html

@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       streamPlayback.playMediaWithStreamStop(false, SimpleTest.finish,
         unexpectedCallbackAndFinish(new Error));
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html

@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html

@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       videoStreamPlayback.playMediaWithStreamStop(false, SimpleTest.finish,
         unexpectedCallbackAndFinish(new Error));
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html

@@ -45,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
       }, unexpectedCallbackAndFinish(new Error));
 
     }, unexpectedCallbackAndFinish(new Error));
-  }, true);
+  });
 
 </script>
 </pre>

dom/media/tests/mochitest/test_peerConnection_basicAudio.html

@@ -20,7 +20,7 @@
     test = new PeerConnectionTest();
     test.setMediaConstraints([{audio: true}], [{audio: true}]);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html

@@ -22,7 +22,7 @@
     test.setMediaConstraints([{audio: true}, {video: true}],
                              [{audio: true}, {video: true}]);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html

@@ -22,7 +22,7 @@
     test.setMediaConstraints([{audio: true}, {video: true}],
                              [{audio: true}, {video: true}]);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_basicVideo.html

@@ -20,7 +20,7 @@
     test = new PeerConnectionTest();
     test.setMediaConstraints([{video: true}], [{video: true}]);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug822674.html

@@ -22,7 +22,7 @@
 
     pc = null;
     SimpleTest.finish();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug825703.html

@@ -65,7 +65,7 @@
 
     pcs = null;
     SimpleTest.finish();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug827843.html

@@ -85,7 +85,7 @@
     test.setMediaConstraints([{audio: true}], [{audio: true}]);
     test.chain.append(steps);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug834153.html

@@ -37,7 +37,7 @@
     }, function (err) {
         croak("createOffer failed: " + err);
     },  { mandatory: { OfferToReceiveAudio: true} });
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug835370.html

@@ -56,7 +56,7 @@
     pconnect = null;
     pconnects = null;
     SimpleTest.finish();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_bug840344.html

@@ -112,7 +112,7 @@
     test.setMediaConstraints([{audio: true, video: true}], [ ]);
     test.chain.replaceAfter("PC_LOCAL_GUM", steps);
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html

@@ -68,7 +68,7 @@
 
   runTest(function () {
     testCreateAnswerError();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html

@@ -18,7 +18,7 @@
     var test = new PeerConnectionTest();
     test.setOfferConstraints({ mandatory: { OfferToReceiveAudio: true } });
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html

@@ -18,7 +18,7 @@
     var test = new PeerConnectionTest();
     test.setOfferConstraints({ mandatory: { OfferToReceiveVideo: true } });
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html

@@ -21,7 +21,7 @@
       OfferToReceiveAudio: true
     }});
     test.run();
-  }, true);
+  });
 </script>
 </pre>
 </body>

dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html

@@ -64,7 +64,7 @@
       }, getFail(new Error));
       throw new Error("Expected");
     });
-  }, 1);
+  });
 
   function finish() {
     window.onerror = oldOnError;

testing/mochitest/b2g.json

@@ -205,6 +205,7 @@
     "dom/file/test/test_write_read_data.html":"",
     "dom/imptests/editing/conformancetest/test_event.html":"",
     "dom/imptests/editing/conformancetest/test_runtest.html":"",
+    "dom/media/tests/mochitest":"",
     "dom/mobilemessage/tests/test_sms_basics.html":"",
     "dom/network/tests/test_networkstats_basics.html":"",
     "dom/permission/tests/test_permission_basics.html":"",