[fuchsia] fix cast-streaming test

It includes several fixes here and there, and gets rid of the
unnecessary retry on astro.

I explained most of the outstanding changes in the comments inline.

Cq-Include-Trybots: luci.chrome.try:fuchsia-cast-astro,fuchsia-cast-nelson,fuchsia-cast-sherlock
Change-Id: I0ab3aea99214c390ed0c7a0dd914fcc2d465102d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5833214
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Zijie He <zijiehe@google.com>
Cr-Commit-Position: refs/heads/main@{#1350920}

content/test/gpu/gpu_tests/cast_streaming_integration_test.py

@@ -45,12 +45,15 @@ class CastStreamingIntegrationTest(
     # This property actually comes off the class, not 'self'.
     tab = self.tab
 
+    tab.action_runner.WaitForJavaScriptCondition(
+        'document.readyState === "complete"')
+
     # Request a frame.
     tab.ExecuteJavaScript('domAutomationController.setFrameRequest(1)')
 
     # Wait until the test is done.
     tab.action_runner.WaitForJavaScriptCondition(
-        'domAutomationController._done', timeout=10)
+        'domAutomationController._done')
     has_failed = tab.EvaluateJavaScript('domAutomationController._failure')
 
     try:
@@ -58,7 +61,7 @@ class CastStreamingIntegrationTest(
         self.fail('page indicated test failure')
       else:
         # Actually run the test and capture the screenshot.
-        screenshot = tab.Screenshot(5)
+        screenshot = tab.Screenshot()
         self._UploadTestResultToSkiaGold(page.name, screenshot, page)
     finally:
       self._RestartBrowser('Must restart after every test')

content/test/gpu/gpu_tests/test_expectations/cast_streaming_expectations.txt

@@ -89,5 +89,3 @@
 ###################
 # Failures/Flakes #
 ###################
-
-crbug.com/1420075 [ fuchsia-board-astro ] CastStreaming_VP8_1Frame [ RetryOnFailure ]

fuchsia_web/shell/cast_streaming_shell_data/injector.js

@@ -11,21 +11,21 @@ domAutomationController._frame_request = 0;
 domAutomationController._done = false;
 domAutomationController._failure = false;
 
-function requestVideoFrameCallback() {
-  const video = document.querySelector('video');
-  if (!video) {
-    console.log('Video element could not be found');
-    window.close();
-    return;
-  }
-  video.requestVideoFrameCallback(domAutomationController.addFrame);
-}
-
 // Waits for document to be fully loaded before calling
 // requestVideoFrameCallback.
 document.onreadystatechange = function() {
-  if (document.readystate === 'complete') {
-    requestVideoFrameCallback();
+  if (document.readyState === 'complete') {
+    const video = document.querySelector('video');
+    if (!video) {
+      console.log('Video element could not be found');
+      window.close();
+      return;
+    }
+    video.requestVideoFrameCallback(function(now, metadata) {
+      // Increments frame count when a frame is presented for composition.
+      domAutomationController._frame_count++;
+      domAutomationController.checkTermination();
+    });
   }
 }
 
@@ -40,15 +40,6 @@ domAutomationController.checkTermination = function() {
   }
 }
 
-// Increments frame count when a frame is presented for composition.
-domAutomationController.addFrame = function(now, metadata) {
-  domAutomationController._frame_count++;
-  domAutomationController.checkTermination();
-  if (!this._done) {
-    requestVideoFrameCallback();
-  }
-}
-
 // Tracks frame requests.
 domAutomationController.setFrameRequest = function(frame_request) {
   this._frame_request = frame_request;