Cleanup tests related to controls hiding/fading in/out

LayoutTests/media/video-controls-hide-on-move-outside-controls.html

Index: LayoutTests/media/video-controls-hide-on-move-outside-controls.html
diff --git a/LayoutTests/media/video-controls-hide-on-move-outside-controls.html b/LayoutTests/media/video-controls-hide-on-move-outside-controls.html
index ddea8decb1701046a0f9fc488ae7e5e62bc5d7ef..bbd27246f8be2dbc2a2796618cdb0ae7283f0646 100644
--- a/LayoutTests/media/video-controls-hide-on-move-outside-controls.html
+++ b/LayoutTests/media/video-controls-hide-on-move-outside-controls.html
@@ -15,16 +15,6 @@ var controls;
 function runTest()
 {
     video = document.getElementById("no-video-media");
-    video.addEventListener("timeupdate", function()
-    {
-        if (video.currentTime < 4)
-            return;
-        controls = mediaControlsButton(video, "panel");
-        testExpected("getComputedStyle(controls).opacity", 0);
-
-        consoleWrite("");
-        endTest();
-    });
 
     testExpected("video.paused", true);
     if (!window.testRunner)
@@ -39,6 +29,15 @@ function runTest()
     eventSender.mouseUp();
     testExpected("video.paused", false);
 
+    runAfterControlsHidden(function()
+    {
+        controls = mediaControlsButton(video, "panel");
+        testExpected("getComputedStyle(controls).opacity", 0);
+
+        consoleWrite("");
+        endTest();
+    }, video);
+
     // Move the mouse to the upper-left corner of the video.
     eventSender.mouseMoveTo(video.offsetLeft + 4, video.offsetTop + 4);
 }