Media Controls: Remove modern directory from layout tests

This CL takes layout tests out of media/controls/modern and puts them
directly into media/controls. We no longer support legacy controls so
there's no need to differentiate between the two.

Bug: 884215
Change-Id: I5eb8f5e4db9c5a5db675703c153fefdc34d7b145
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1655982Reviewed-by: Becca Hughes <beccahughes@google.com>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668501}

third_party/blink/web_tests/SlowTests

@@ -230,7 +230,7 @@ crbug.com/741259 editing/selection/select-bidi-run.html [ Slow ]
 crbug.com/451577 [ Linux ] http/tests/devtools/elements/user-properties.js [ Slow ]
 crbug.com/451577 [ Linux ] http/tests/devtools/layers/layer-canvas-log.js [ Slow ]
 
-crbug.com/793771 media/controls/modern/scrubbing.html [ Slow ]
+crbug.com/793771 media/controls/scrubbing.html [ Slow ]
 
 # These tests need to do many iterations and so can't be fast.
 crbug.com/748418 http/tests/streams/chromium/deep-recursion-getwriter.html [ Slow ]

third_party/blink/web_tests/TestExpectations

@@ -4825,19 +4825,19 @@ crbug.com/667560 http/tests/devtools/elements/styles-4/inline-style-sourcemap.js
 
 # 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 ] media/controls/modern/doubletap-to-jump-backwards.html [ Skip ]
-crbug.com/783154 [ Mac ] media/controls/modern/doubletap-to-jump-forwards.html [ Skip ]
-crbug.com/783154 [ Mac ] media/controls/modern/doubletap-to-jump-forwards-too-short.html [ Skip ]
-crbug.com/783154 [ Mac ] media/controls/modern/doubletap-on-play-button.html [ Skip ]
-crbug.com/783154 [ Mac ] media/controls/modern/doubletap-to-toggle-fullscreen.html [ Skip ]
+crbug.com/783154 [ Mac ] media/controls/doubletap-to-jump-backwards.html [ Skip ]
+crbug.com/783154 [ Mac ] media/controls/doubletap-to-jump-forwards.html [ Skip ]
+crbug.com/783154 [ Mac ] media/controls/doubletap-to-jump-forwards-too-short.html [ Skip ]
+crbug.com/783154 [ Mac ] media/controls/doubletap-on-play-button.html [ Skip ]
+crbug.com/783154 [ Mac ] media/controls/doubletap-to-toggle-fullscreen.html [ Skip ]
 crbug.com/783154 [ Mac ] media/controls/click-anywhere-to-play-pause.html [ Skip ]
 
 # Seen flaky on Linux, suppressing on Windows as well
-crbug.com/831720 [ Win ] media/controls/modern/doubletap-to-jump-forwards-too-short.html [ Pass Failure ]
-crbug.com/831720 [ Linux ] media/controls/modern/doubletap-to-jump-forwards-too-short.html [ Pass Failure ]
-crbug.com/831720 [ Mac ] media/controls/modern/tap-to-hide-controls.html [ Pass Failure ]
-crbug.com/831720 [ Win ] media/controls/modern/tap-to-hide-controls.html [ Pass Failure ]
-crbug.com/831720 [ Linux ] media/controls/modern/tap-to-hide-controls.html [ Pass Failure ]
+crbug.com/831720 [ Win ] media/controls/doubletap-to-jump-forwards-too-short.html [ Pass Failure ]
+crbug.com/831720 [ Linux ] media/controls/doubletap-to-jump-forwards-too-short.html [ Pass Failure ]
+crbug.com/831720 [ Mac ] media/controls/tap-to-hide-controls.html [ Pass Failure ]
+crbug.com/831720 [ Win ] media/controls/tap-to-hide-controls.html [ Pass Failure ]
+crbug.com/831720 [ Linux ] media/controls/tap-to-hide-controls.html [ Pass Failure ]
 
 crbug.com/802915 css3/blending/isolation-should-include-non-local-background.html [ Failure ]
 
@@ -4847,7 +4847,7 @@ crbug.com/779087 external/wpt/html/semantics/embedded-content/media-elements/aut
 crbug.com/779087 external/wpt/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html [ Skip ]
 
 # Does not work on Mac
-crbug.com/793771 [ Mac ] media/controls/modern/scrubbing.html [ Skip ]
+crbug.com/793771 [ Mac ] media/controls/scrubbing.html [ Skip ]
 crbug.com/916902 [ Mac ] virtual/fractional_scrolling/fast/scrolling/overflow-scrollability.html [ Skip ]
 
 # Different paths may have different anti-aliasing pixels 2018-02-21

third_party/blink/web_tests/media/controls/modern/add-poster-after-page-load.html → third_party/blink/web_tests/media/controls/add-poster-after-page-load.html

 <!DOCTYPE html>
 <html>
 <title>Test that adding a poster after page load shows the poster.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 preload=none src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 preload=none src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');
 
   window.onload = t.step_func(() => {
     assert_true(showsDefaultPoster());
-    video.setAttribute('poster', '../../content/greenbox.png');
+    video.setAttribute('poster', '../content/greenbox.png');
     setTimeout(t.step_func_done(() => {
       assert_false(showsDefaultPoster());
     }));

third_party/blink/web_tests/media/controls/modern/dont-show-disabled-controls-in-overflow.html → third_party/blink/web_tests/media/controls/dont-show-disabled-controls-in-overflow.html

 <!DOCTYPE html>
 <html>
 <title>Test that small videos don't show disabled mute/fullscreen buttons in the overflow menu.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=50 preload=none src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=50 preload=none src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/doubletap-on-play-button.html → third_party/blink/web_tests/media/controls/doubletap-on-play-button.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will play then pause if double tapped on the overlay play button.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src = '../../content/60_sec_video.webm';
+  video.src = '../content/60_sec_video.webm';
   document.body.appendChild(video);
   let didPause = false;
 

third_party/blink/web_tests/media/controls/modern/doubletap-to-jump-backwards-at-start.html → third_party/blink/web_tests/media/controls/doubletap-to-jump-backwards-at-start.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will jump to the beginning if it's in the first 10 seconds.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/doubletap-to-jump-backwards.html → third_party/blink/web_tests/media/controls/doubletap-to-jump-backwards.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will jump backwards 10 seconds if double tapped on the left hand side.</title>
-<script src="../../../resources/gesture-util.js"></script>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/gesture-util.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/doubletap-to-jump-forwards-too-short.html → third_party/blink/web_tests/media/controls/doubletap-to-jump-forwards-too-short.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will jump to the end if less than 10 seconds remaining.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/doubletap-to-jump-forwards.html → third_party/blink/web_tests/media/controls/doubletap-to-jump-forwards.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will jump forwards 10 seconds if double tapped.</title>
-<script src="../../../resources/gesture-util.js"></script>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/gesture-util.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/doubletap-to-toggle-fullscreen.html → third_party/blink/web_tests/media/controls/doubletap-to-toggle-fullscreen.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will enter fullscreen if double tapped.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/immersive-mode-adds-css-class.html → third_party/blink/web_tests/media/controls/immersive-mode-adds-css-class.html

 <!DOCTYPE html>
 <html>
 <title>Test that enabling immersive mode adds the immersive mode CSS class.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../../resources/run-after-layout-and-paint.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 preload=metadata src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../../resources/run-after-layout-and-paint.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 preload=metadata src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/overflow-button-disabled-no-source.html → third_party/blink/web_tests/media/controls/overflow-button-disabled-no-source.html

 <!DOCTYPE html>
 <html>
 <title>Test that the overflow menu is shown but disabled with no source.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
 <video controls width=400 controlsList=nodownload disablePictureInPicture></video>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   assert_equals(overflowButton(video).style.display, '');
 
   // Set the source and start playing.
-  video.src = '../../content/60_sec_video.webm';
+  video.src = '../content/60_sec_video.webm';
   video.play().then(t.step_func_done(() => {
     // Make sure the button has been hidden and is no longer disabled.
     assert_false(overflowButton(video).disabled);

third_party/blink/web_tests/media/controls/modern/overlay-play-button-tap-to-hide.html → third_party/blink/web_tests/media/controls/overlay-play-button-tap-to-hide.html

 <!DOCTYPE html>
 <title>Hide the overlay play button on play, show it on tap</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body>
 <script>
 async_test((t) => {
@@ -46,6 +46,6 @@ async_test((t) => {
     singleTapOnControl(button);
   }), { once: true });
 
-  video.src = '../../content/test.webm';
+  video.src = '../content/test.webm';
 });
 </script>

third_party/blink/web_tests/media/controls/modern/quirks-mode-timeline-is-not-hidden.html → third_party/blink/web_tests/media/controls/quirks-mode-timeline-is-not-hidden.html

 <html>
 <!-- We don't declare a DOCTYPE in order to force quirks mode -->
 <title>Test that on quirks mode the timeline is not hidden.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
 <body>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/scrubbing-stops-when-controls-hidden.html → third_party/blink/web_tests/media/controls/scrubbing-stops-when-controls-hidden.html

 <!DOCTYPE html>
 <title>Tests that scrubbing stops when the controls are hidden.</title>
-<script src='../../../resources/testharness.js'></script>
-<script src='../../../resources/testharnessreport.js'></script>
-<script src='../../media-controls.js'></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src='../../resources/testharness.js'></script>
+<script src='../../resources/testharnessreport.js'></script>
+<script src='../media-controls.js'></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   let video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/scrubbing-touch.html → third_party/blink/web_tests/media/controls/scrubbing-touch.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will behave correctly when scrubbing with touch events.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/scrubbing.html → third_party/blink/web_tests/media/controls/scrubbing.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will behave correctly when scrubbing.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/show-pause-icon-on-non-overlay-play-button.html → third_party/blink/web_tests/media/controls/show-pause-icon-on-non-overlay-play-button.html

 <!DOCTYPE html>
 <html>
 <title>Test that playing a video shows a pause icon in the non-overlay play button.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=90 preload=metadata src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=90 preload=metadata src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/singletap-on-outside.html → third_party/blink/web_tests/media/controls/singletap-on-outside.html

 <!DOCTYPE html>
 <html>
 <title>Test that the player pauses if single taped in the outer region.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src = '../../content/60_sec_video.webm';
+  video.src = '../content/60_sec_video.webm';
   document.body.appendChild(video);
 
   video.addEventListener('playing', t.step_func(() => {

third_party/blink/web_tests/media/controls/modern/singletap-on-overlay-closes-overflow-menu.html → third_party/blink/web_tests/media/controls/singletap-on-overlay-closes-overflow-menu.html

 <!DOCTYPE html>
 <html>
 <title>Test that the overflow menu closes when the overlay play button area is tapped.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src='../../content/60_sec_video.webm';
+  video.src='../content/60_sec_video.webm';
   document.body.appendChild(video);
 
   var button = overflowButton(video);

third_party/blink/web_tests/media/controls/modern/singletap-on-play-button.html → third_party/blink/web_tests/media/controls/singletap-on-play-button.html

 <!DOCTYPE html>
 <html>
 <title>Test that the player pauses if single tapped on the play button.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src='../../content/60_sec_video.webm';
+  video.src='../content/60_sec_video.webm';
   document.body.appendChild(video);
 
   video.addEventListener('playing', t.step_func(() => {

third_party/blink/web_tests/media/controls/modern/singletouch-on-play-button.html → third_party/blink/web_tests/media/controls/singletouch-on-play-button.html

 <!DOCTYPE html>
 <html>
 <title>Test that the player pauses if single-touched on the play button.</title>
-<script src="../../../resources/gesture-util.js"></script>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/gesture-util.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -15,7 +15,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src='../../content/60_sec_video.webm';
+  video.src='../content/60_sec_video.webm';
   document.body.appendChild(video);
 
   let tap_gesture;

third_party/blink/web_tests/media/controls/modern/slow-doubletap.html → third_party/blink/web_tests/media/controls/slow-doubletap.html

 <!DOCTYPE html>
 <html>
 <title>Test that player will not jump if the tap is too slow.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/tap-to-hide-controls.html → third_party/blink/web_tests/media/controls/tap-to-hide-controls.html

 <!DOCTYPE html>
 <html>
 <title>Test that the controls are hidden if they are tapped</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   // This number comes from MediaControlOverlayPlayButtonElement.cpp.

third_party/blink/web_tests/media/controls/modern/video-does-not-go-fullscreen-on-double-click-before-preload.html → third_party/blink/web_tests/media/controls/video-does-not-go-fullscreen-on-double-click-before-preload.html

 <!DOCTYPE html>
 <html>
 <title>Test that videos do not fullscreen when double-clicked before preload.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<script src="../overlay-play-button.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<script src="overlay-play-button.js"></script>
 <body></body>
 <script>
 async_test(t => {
@@ -14,7 +14,7 @@ async_test(t => {
   const video = document.createElement('video');
   video.controls = true;
   video.width = 400;
-  video.src='../../content/60_sec_video.webm';
+  video.src='../content/60_sec_video.webm';
   document.body.appendChild(video);
   video.addEventListener("webkitfullscreenchange", t.unreached_func());
 

third_party/blink/web_tests/media/controls/modern/video-preload-none-has-disabled-controls.html → third_party/blink/web_tests/media/controls/video-preload-none-has-disabled-controls.html

 <!DOCTYPE html>
 <html>
 <title>Test that videos have disabled mute/fullscreen buttons before preload.</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
-<video controls width=400 preload=none src="../../content/60_sec_video.webm"></video>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
+<video controls width=400 preload=none src="../content/60_sec_video.webm"></video>
 <script>
 async_test(t => {
   const video = document.querySelector('video');

third_party/blink/web_tests/media/controls/modern/video-tag-with-only-audio-looks-like-audio-tag.html → third_party/blink/web_tests/media/controls/video-tag-with-only-audio-looks-like-audio-tag.html

 <!DOCTYPE html>
 <html>
 <title>Test video tag with only audio looks like audio tag</title>
-<script src="../../../resources/testharness.js"></script>
-<script src="../../../resources/testharnessreport.js"></script>
-<script src="../../media-controls.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../media-controls.js"></script>
 <video id="with-video" controls preload=metadata>
-  <source src="../../content/60_sec_video.webm" />
+  <source src="../content/60_sec_video.webm" />
 </video>
 <video id="with-audio" controls preload=metadata>
-  <source src="../../content/test.oga" />
+  <source src="../content/test.oga" />
 </video>
 <script>
 async_test(t => {
   let videoWithVideo = document.getElementById('with-video');
   let videoWithAudio = document.getElementById('with-audio');
-  const videoURL = '../../content/60_sec_video.webm';
-  const audioURL = '../../content/test.oga';
+  const videoURL = '../content/60_sec_video.webm';
+  const audioURL = '../content/test.oga';
   let completedTests = 0;
 
   videoWithVideo.onloadedmetadata = t.step_func(() => {