Cleanup fullscreen tests by not listening to events after tests end

This patch cleans up flakiness caused by video-overlay-scroll.html which
had a fullscreenchange event handler that fired twice, but was only
intended to fire once in the test. The test used waitForEventAndEnd
which continued calling the event handler after the test ended. This
patch updates this function to waitForEventOnceAndEnd which makes it
clear that the event handler will be removed after firing once.

The root-cause of this flakiness is being fixed in
https://crrev.com/c/2275348 and this patch is just followup cleanup.

Bug: 1048597
Change-Id: I4b7473879085e5a7f91875f4daa53a2891c9274e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2275350Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784142}

third_party/blink/web_tests/fullscreen/full-screen-iframe-zIndex.html

@@ -7,7 +7,7 @@
             function init() {
                 var iframe = document.getElementById('block1');
                 var element = iframe.contentDocument.documentElement;
-                waitForEventAndEnd(element, 'webkitfullscreenchange');
+                waitForEventOnceAndEnd(element, 'webkitfullscreenchange');
                 runWithKeyDown(goFullScreen);
             }
 

third_party/blink/web_tests/fullscreen/full-screen-min-max-width-height-iframe.html

@@ -15,7 +15,7 @@ iframe {
 <script>
 iframe = document.querySelector('iframe');
 
-waitForEventAndEnd(document, 'webkitfullscreenchange', function()
+waitForEventOnceAndEnd(document, 'webkitfullscreenchange', function()
 {
     computedStyle = getComputedStyle(iframe);
     testExpected('computedStyle.minWidth', '0px');

third_party/blink/web_tests/fullscreen/full-screen-min-max-width-height-video.html

@@ -15,7 +15,7 @@ video {
 <script>
 video = document.querySelector('video');
 
-waitForEventAndEnd(document, 'webkitfullscreenchange', function()
+waitForEventOnceAndEnd(document, 'webkitfullscreenchange', function()
 {
     computedStyle = getComputedStyle(video);
     testExpected('computedStyle.minWidth', '0px');

third_party/blink/web_tests/fullscreen/full-screen-request-not-supported.html

@@ -11,7 +11,7 @@ in those platforms where fullscreen is not supported.
             logResult(false, 'Entered fullscreen.');
             endTest();
         });
-        waitForEventAndEnd(document, 'webkitfullscreenerror');
+        waitForEventOnceAndEnd(document, 'webkitfullscreenerror');
         runWithKeyDown(function(){document.getElementById('video').webkitRequestFullScreen()});
     }
 </script>

third_party/blink/web_tests/fullscreen/full-screen-request-rejected.html

@@ -8,6 +8,6 @@
     });
     if (window.testRunner)
         testRunner.setPopupBlockingEnabled(true);
-    waitForEventAndEnd(document, 'webkitfullscreenerror');
+    waitForEventOnceAndEnd(document, 'webkitfullscreenerror');
     document.documentElement.webkitRequestFullScreen();
 </script>

third_party/blink/web_tests/fullscreen/full-screen-request-removed.html

@@ -4,11 +4,11 @@ Emit an error event when a request to enter full-screen is rejected.</p>
 <script src="full-screen-test.js"></script>
 <script>
 function runTest() {
-    waitForEventAndEnd(document, 'webkitfullscreenchange', function() { 
+    waitForEventOnceAndEnd(document, 'webkitfullscreenchange', function() {
             consoleWrite("FAIL - entered full screen!"); 
     });
 
-    waitForEventAndEnd(document, 'webkitfullscreenerror', function() {
+    waitForEventOnceAndEnd(document, 'webkitfullscreenerror', function() {
         consoleWrite("SUCCEED - did not enter full screen!");
     });
 

third_party/blink/web_tests/fullscreen/full-screen-test.js

@@ -87,9 +87,9 @@ function reportExpected(success, testFuncString, comparison, expected, observed)
     logResult(success, msg);
 }
 
-function waitForEventAndEnd(element, eventName, funcString)
+function waitForEventOnceAndEnd(element, eventName, funcString)
 {
-    waitForEvent(element, eventName, funcString, true)
+    waitForEvent(element, eventName, funcString, true, true)
 }
 
 function waitForEventOnce(element, eventName, func, endit)

third_party/blink/web_tests/fullscreen/full-screen-twice.html

@@ -6,7 +6,7 @@
 
     var spanEnteredFullScreen = function() {
         testExpected("document.webkitCurrentFullScreenElement", span);
-        waitForEventAndEnd(document, "webkitfullscreenchange");
+        waitForEventOnceAndEnd(document, "webkitfullscreenchange");
         runWithKeyDown(function(){document.documentElement.webkitRequestFullScreen()});
     };
 

third_party/blink/web_tests/fullscreen/full-screen-zIndex.html

@@ -5,7 +5,7 @@
             var runPixelTests = true;
             
             function init() {
-                waitForEventAndEnd(document, 'webkitfullscreenchange');
+                waitForEventOnceAndEnd(document, 'webkitfullscreenchange');
                 runWithKeyDown(goFullScreen);
             }
             

third_party/blink/web_tests/fullscreen/video-controls-timeline.html

@@ -23,7 +23,7 @@
                 eventSender.mouseDown();
 
                 waitForEvent(timeline, 'mouseup');
-                waitForEventAndEnd(video, 'seeked');
+                waitForEventOnceAndEnd(video, 'seeked');
                 eventSender.mouseUp();
             }
             else

third_party/blink/web_tests/fullscreen/video-fixed-at-top-left.html

@@ -8,7 +8,7 @@ This test verifies videos in fullscreen mode are not affected by CSS top/left pr
 var clientRect;
 var video = document.getElementById('video');
 
-waitForEventAndEnd(document, 'webkitfullscreenchange', function(){
+waitForEventOnceAndEnd(document, 'webkitfullscreenchange', function(){
     clientRect = video.getBoundingClientRect();
     testExpected('clientRect.left', 0)
     testExpected('clientRect.top', 0)

third_party/blink/web_tests/virtual/android/fullscreen/video-fixed-background-expected.html

@@ -17,7 +17,7 @@
             logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
             endTest();
         } else {
-            waitForEventAndEnd(document, 'webkitfullscreenchange');
+            waitForEventOnceAndEnd(document, 'webkitfullscreenchange');
             runWithKeyDown(function(){video.webkitRequestFullScreen()});
         }
     </script>

third_party/blink/web_tests/virtual/android/fullscreen/video-fixed-background.html

@@ -17,7 +17,7 @@
             logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
             endTest();
         } else {
-            waitForEventAndEnd(document, 'webkitfullscreenchange');
+            waitForEventOnceAndEnd(document, 'webkitfullscreenchange');
             runWithKeyDown(function(){video.webkitRequestFullScreen()});
         }
     </script>

third_party/blink/web_tests/virtual/android/fullscreen/video-overlay-scroll.html

@@ -8,7 +8,7 @@
       testRunner.dumpAsText();
 
     window.scrollTo(0, 1000);
-    waitForEventAndEnd(document, 'fullscreenchange', function(){
+    waitForEventOnceAndEnd(document, 'fullscreenchange', function(){
       testRunner.setCustomTextOutput(internals.layerTreeAsText(document));
     });