Autoplay: Harden and switch layout tests back on

Harden feature policy layout tests and switch them back on.

These tests are still disabled with site isolation until
HasBeenActivated is replicated.

BUG=794631,790549

Change-Id: I8fd2be1f9222c71288d5e39e1639c4d990df995b
Reviewed-on: https://chromium-review.googlesource.com/966069Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545804}

third_party/WebKit/LayoutTests/FlagExpectations/site-per-process

@@ -154,3 +154,13 @@ crbug.com/711468 virtual/gpu/fast/canvas/canvas-scale-strokePath-shadow.html [ P
 crbug.com/711468 http/tests/intersection-observer/cross-origin-iframe-with-nesting.html [ Failure ]
 
 crbug.com/807675 http/tests/images/image-decode-in-frame.html [ Crash Failure ]
+
+# These tests have issues with —site-per-process. https://crbug.com/794631
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-disabled.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-gesture.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-feature-policy-alternating.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-feature-policy-same-origin.html [ Failure Pass Timeout ]
+crbug.com/794631 http/tests/media/autoplay/document-user-activation-iframe-delegation.html [ Failure Pass Timeout ]

third_party/WebKit/LayoutTests/TestExpectations

@@ -3198,16 +3198,6 @@ crbug.com/791941 [ Mac ] virtual/gpu-rasterization/images/color-profile-clip.htm
 crbug.com/791941 [ Mac ] virtual/gpu-rasterization/images/color-profile-munsell-adobe-to-srgb.html [ Pass Failure ]
 crbug.com/791941 [ Mac ] virtual/gpu-rasterization/images/color-profile-munsell-srgb-to-srgb.html [ Pass Failure ]
 
-# These tests fail often on Linux and Mac and Windows. https://crbug.com/790549
-crbug.com/788390 [ Linux Win ] http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux Win ] http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-disabled.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux Mac Win ] http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-gesture.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux Win ] http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux ] http/tests/media/autoplay/document-user-activation-feature-policy-alternating.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux ] http/tests/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux ] http/tests/media/autoplay/document-user-activation-feature-policy-same-origin.html [ Failure Pass Timeout ]
-crbug.com/788390 [ Linux ] http/tests/media/autoplay/document-user-activation-iframe-delegation.html [ Failure Pass Timeout ]
-
 # Double tap on modern media controls is a bit more complicated on Mac but
 # since we are not targeting Mac yet we can come back and fix this later.
 crbug.com/783154 [ Mac ] virtual/modern-media-controls/media/controls/modern/doubletap-to-jump-backwards.html [ Skip ]

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html

@@ -5,13 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with allow="autoplay" -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
-  simulateViewportClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': true
-  });
+  runTest(simulateViewportClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', true]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-disabled.html

@@ -5,13 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with allow="autoplay" -->
-<iframe src="http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html"></iframe>
+<iframe></iframe>
 <script>
-  simulateViewportClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-disabled.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html': false,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': false
-  });
+  runTest(simulateViewportClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-disabled.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html', false],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', false]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-gesture.html

@@ -5,13 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with allow="autoplay" -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
-  simulateFrameClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-gesture.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': true
-  });
+  runTest(simulateFrameClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-gesture.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', true]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html

@@ -5,12 +5,11 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe that disables autoplay with a HTTP header -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-frame-with-header.php"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
-  simulateViewportClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-frame-with-header.php': false
-  });
+  runTest(simulateViewportClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-header.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-frame-with-header.php', false]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-feature-policy-alternating.html

@@ -5,13 +5,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with no allow attribute -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-iframe-1b.html"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
   simulateViewportClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-feature-policy-alternating.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1b.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': false
-  });
+  runTest(simulateViewportClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-feature-policy-alternating.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1b.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', false]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html

@@ -5,12 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with allow="autoplay" -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-cross-origin-feature-policy-delegation.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html': false,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': false
-  });
+  runTest(simulateNoGesture, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-feature-policy-iframe-no-gesture.html', false],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html', false],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', false]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-feature-policy-same-origin.html

@@ -5,13 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/autoplay-test.js"></script>
 <!-- This is a same origin frame with a sub origin child frame with no allow attributes -->
-<iframe src="/media/autoplay/resources/nested-iframe-1b.html"></iframe>
+<iframe></iframe>
 <script>
-  simulateViewportClick();
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/document-user-activation-feature-policy-same-origin.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-1b.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': true
-  });
+  runTest(simulateViewportClick, [
+    ['http://127.0.0.1:8000/media/autoplay/document-user-activation-feature-policy-same-origin.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-1b.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', true]
+  ]);
 </script>
 </html>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/document-user-activation-iframe-delegation.html

 <!DOCTYPE html>
 <title>Test user gesture is delegated to iframes after navigation.</title>
 <script>
-  chrome.gpuBenchmarking.pointerActionSequence([
-      {"source": "mouse",
-       "actions": [
-       { "name": "pointerDown", "x": 0, "y": 0 },
-       { "name": "pointerUp" } ]}]);
-
   if (window.testRunner) {
     testRunner.waitUntilDone();
     testRunner.dumpAsText();
   }
 
-  document.location.href = 'resources/test-autoplay-post-navigation.html';
+  chrome.gpuBenchmarking.pointerActionSequence([
+      {"source": "mouse",
+       "actions": [
+       { "name": "pointerDown", "x": 0, "y": 0 },
+       { "name": "pointerUp" } ]}], () => {
+         document.location.href = 'resources/test-autoplay-post-navigation.html';
+       });
 </script>

third_party/WebKit/LayoutTests/http/tests/media/autoplay/resources/autoplay-test.js

@@ -3,9 +3,10 @@
  */
 
 // Tracks the results and how many active tests we have running.
-let activeTests;
 let testExpectations = {};
 let callback;
+let resultCallback = (data) => { top.postMessage(data, '*') };
+let completedTestResults = [];
 
 function tearDown(result) {
   // Reset the flag state.
@@ -31,11 +32,20 @@ function receivedResult(data) {
     return;
   }
 
-  activeTests--;
-  assert_equals(testExpectations[data.url], data.message);
+  completedTestResults.push(data);
+  processTestResults();
+}
+
+function processTestResults() {
+  // Check if we have completed all the tests.
+  if (Object.keys(testExpectations).length != completedTestResults.length)
+    return;
+
+  completedTestResults.forEach((data) => {
+    assert_equals(testExpectations[data.url], data.message);
+  });
 
-  if (!activeTests)
-    callback();
+  callback();
 }
 
 function runVideoTest() {
@@ -44,15 +54,15 @@ function runVideoTest() {
   video.play().then(tearDown, tearDown);
 }
 
-function simulateViewportClick() {
+function simulateViewportClick(callback) {
   chrome.gpuBenchmarking.pointerActionSequence([
       {"source": "mouse",
        "actions": [
        { "name": "pointerDown", "x": 0, "y": 0 },
-       { "name": "pointerUp" } ]}]);
+       { "name": "pointerUp" } ]}], callback);
 }
 
-function simulateFrameClick() {
+function simulateFrameClick(callback) {
   const frame = document.getElementsByTagName('iframe')[0];
   const rect = frame.getBoundingClientRect();
 
@@ -64,32 +74,42 @@ function simulateFrameClick() {
          "x": rect.left + (rect.width / 2),
          "y": rect.top + (rect.height / 2)
        },
-       { "name": "pointerUp" } ]}]);
+       { "name": "pointerUp" } ]}], callback);
+}
+
+function simulateNoGesture(callback) {
+  callback();
 }
 
-function runTest(expectations) {
+function runTest(pointerSequence, expectations) {
+  // Setup the global variables.
+  expectations.forEach((expectation) => {
+    testExpectations[expectation[0]] = expectation[1];
+  });
+
+  // Run the test.
   async_test((t) => {
-    testExpectations = expectations;
-    activeTests = Object.keys(expectations).length;
     callback = t.step_func_done();
-  });
-}
 
-window.addEventListener('load', () => {
-  if (!window.testRunner)
-    return;
+    // Fire the pointer sequence and then run the video test.
+    pointerSequence(t.step_func(() => {
+      runVideoTest();
 
-  // Setup the flags before the test is run.
-  window.internals.settings.setAutoplayPolicy('document-user-activation-required');
+      // Navigate the iframe now we have the gesture.
+      document.getElementsByTagName('iframe')[0].src =
+          expectations[1][0];
+    }));
 
-  // Setup the event listener to forward messages.
-  window.addEventListener('message', (e) => {
-    if (callback) {
-      receivedResult(e.data);
-    } else {
-      top.postMessage(e.data, '*');
-    }
+    resultCallback = t.step_func(receivedResult);
   });
+}
+
+// Setup the flags before the test is run.
+window.internals.settings.setAutoplayPolicy('document-user-activation-required');
+
+// Setup the event listener to forward messages.
+window.addEventListener('message', (e) => { resultCallback(e.data); });
 
+// If we are on an iframe then run the video test automatically.
+if (window.self !== window.top)
   runVideoTest();
-}, { once: true });

third_party/WebKit/LayoutTests/http/tests/media/autoplay/resources/test-autoplay-post-navigation.html

@@ -5,12 +5,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="autoplay-test.js"></script>
 <!-- This is a cross origin iframe with a same origin child with allow="autoplay" -->
-<iframe allow="autoplay" src="http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html"></iframe>
+<iframe allow="autoplay"></iframe>
 <script>
-  runTest({
-    'http://127.0.0.1:8000/media/autoplay/resources/test-autoplay-post-navigation.html': true,
-    'http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html': true,
-    'http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html': true
-  });
+  runTest(simulateNoGesture, [
+    ['http://127.0.0.1:8000/media/autoplay/resources/test-autoplay-post-navigation.html', true],
+    ['http://localhost:8000/media/autoplay/resources/nested-iframe-1a.html', true],
+    ['http://127.0.0.1:8000/media/autoplay/resources/nested-iframe-2.html', true]
+  ]);
 </script>
 </html>