Backout ad3355a8d31f, c788ef01538a for being a bit too restrictive for user choice

mobile/android/base/tests/testVideoDiscovery.js

@@ -48,13 +48,7 @@ let videoDiscoveryTests = [
   { id: "with-sources-mp4", source: "http://mochi.test:8888/simple.mp4", text: "video with mp4 extension source child" },
   { id: "with-sources-fail", pass: false, text: "video with no mp4 extension source child" },
   { id: "with-sources-mimetype", source: "http://mochi.test:8888/simple-video-mp4", text: "video with mp4 mimetype source child" },
-  { id: "video-overlay", source: "http://mochi.test:8888/simple.mp4", text: "div overlay covering a simple video with mp4 src" },
-
-  { id: "opt-in-simple-mp4", source: "http://mochi.test:8888/simple.mp4", poster: "http://mochi.test:8888/simple.png", text: "simple video with mp4 src" },
-  { id: "opt-out-simple-mp4", pass: false, text: "simple video with mp4 src but opt-out" },
-  { id: "opt-in-simple-fail", pass: false, text: "simple video with opt-in but no mp4 src" },
-  { id: "opt-in-with-sources-mp4", source: "http://mochi.test:8888/simple.mp4", text: "opt-in video with mp4 extension source child" },
-  { id: "opt-out-with-sources-mp4", pass: false, text: "video with mp4 extension source child but opt-out" }
+  { id: "video-overlay", source: "http://mochi.test:8888/simple.mp4", text: "div overlay covering a simple video with mp4 src" }
 ];
 
 function execute_video_test(test) {

mobile/android/base/tests/video_discovery.html

@@ -56,26 +56,5 @@
         <video id="video-player" src="/simple.mp4"></video>
       </div>
     </div>
-
-    <!-- PASS: opt-in and src uses a mp4 extension -->
-    <video id="opt-in-simple-mp4" poster="/simple.png" src="/simple.mp4" x-webkit-airplay="allow"></video>
-
-    <!-- FAIL: opt-out and src uses a mp4 extension -->
-    <video id="opt-out-simple-mp4" poster="/simple.png" src="/simple.mp4" x-webkit-airplay="deny"></video>
-
-    <!-- FAIL: opt-in and src uses a ogg extension -->
-    <video id="opt-in-simple-fail" src="/simple.ogg" x-webkit-airplay="allow"></video>
-
-    <!-- PASS: video with opt-in and source list uses a mp4 extension -->
-    <video id="opt-in-with-sources-mp4" x-webkit-airplay="allow">
-      <source src="/simple.ogg">
-      <source src="/simple.mp4">
-    </video>
-
-    <!-- FAIL: video with opt-out and source list uses a mp4 extension -->
-    <video id="opt-out-with-sources-mp4" x-webkit-airplay="deny">
-      <source src="/simple.ogg">
-      <source src="/simple.mp4">
-    </video>
   </body>
 </html>

mobile/android/chrome/content/CastingApps.js

@@ -176,12 +176,6 @@ var CastingApps = {
       return null;
     }
 
-    // Allow websites to opt-out using the Apple airplay attribute
-    // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/AirPlayGuide/OptingInorOutofAirPlay/OptingInorOutofAirPlay.html
-    if (aElement.getAttribute("x-webkit-airplay") === "deny") {
-      return null;
-    }
-
     // Given the hardware support for H264, let's only look for 'mp4' sources
     function allowableExtension(aURI) {
       if (aURI && aURI instanceof Ci.nsIURL) {