cleanup: address review comments from #6617022

* Static files dispersed to other repos
* URLs to static files corrected
* Formatting changes
* Untested local web-server changes reverted

Bug: 416356440
Change-Id: Id7944645d6f253b28b5d22320b431527fb717996
Reviewed-on: https://chromium-review.googlesource.com/c/crossbench/+/6634469
Commit-Queue: Richard Townsend <[email protected]>
Reviewed-by: Camillo Bruni <[email protected]>

Author: Sentimentron

config/benchmark/powerline/Chrome-Scheduler-Optimization-Benchmarks.ogg

@@ -2,4 +2,5 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from crossbench.benchmarks.powerline.powerline_benchmark import PowerlineBenchmark
+from crossbench.benchmarks.powerline.powerline_benchmark import \
+    PowerlineBenchmark

config/benchmark/powerline/index.html

@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import abc
 import argparse
 import datetime as dt
 import logging
-from typing import Any, Optional
+from typing import Any, Optional, Final
 
 from typing_extensions import override
 
@@ -21,19 +20,16 @@
 from crossbench.parse import DurationParser
 from crossbench.runner.run import Run
 from crossbench.stories.story import Story
+from crossbench.action_runner.action.enums import ReadyState
 
-PLAY_AUDIO_SCRIPT = """
-
-setTimeout(()=>{
+PLAY_AUDIO_SCRIPT: Final[str] = """
   document.getElementById('unmuteButton').click();
-}, 1000);
-
 """
 
-class PowerlineStory(Story, metaclass=abc.ABCMeta):
+class PowerlineStory(Story):
 
   STORY_NAME="podcast"
-  URL="http://localhost:8000"
+  URL="https://chromium-workloads.web.app/web-tests/main/synthetic/powerline/podcast.html"
 
   def __init__(self, run_for: Optional[dt.timedelta] = dt.timedelta()):
     duration = (run_for or dt.timedelta(seconds=600))
@@ -45,11 +41,16 @@ def run(self, run: Run) -> None:
       with run.actions("Show URL") as actions:
         actions.show_url(self.URL)
       with run.actions("Autoplay") as actions:
-        actions.wait(dt.timedelta(seconds=5))
+        actions.wait_for_ready_state(
+          ReadyState.COMPLETE, timeout=dt.timedelta(seconds=5)
+        )
         actions.js(PLAY_AUDIO_SCRIPT)
       with run.actions("Screen") as actions:
         actions.wait(dt.timedelta(seconds=5))
-        actions.platform.sh("input", "keyevent", "26")
+        if actions.platform.is_android:
+          # On Android, put the screen to sleep to simulate playing a
+          # podcast in the background.
+          actions.platform.sh("input", "keyevent", "26")
       self._wait_for_input()
       logging.info("Stopping benchmark...")
 
@@ -69,7 +70,7 @@ def all_story_names(cls) -> tuple[str, ...]:
 
 
 
-class PowerlineBenchmark(Benchmark, metaclass=abc.ABCMeta):
+class PowerlineBenchmark(Benchmark):
   """
   Benchmark runner for the Powerline background power-consumption test.
 
@@ -94,11 +95,6 @@ def __init__(self,
   def _base_dir(cls) -> pth.LocalPath:
     return config.config_dir() / "benchmark" / "powerline"
 
-  @classmethod
-  @override
-  def default_network_config_path(cls) -> pth.LocalPath:
-    return cls._base_dir() / "network_config.hjson"
-
   @classmethod
   @override
   def default_probe_config_path(cls) -> pth.LocalPath:

config/benchmark/powerline/network_config.hjson

@@ -10,7 +10,6 @@
 import json
 import logging
 import math
-import os
 import re
 import shlex
 from typing import (TYPE_CHECKING, Any, Callable, Final, Iterable, Optional,
@@ -37,7 +36,7 @@ class PathParser:
   PATH_PREFIX = re.compile(r"^(?:"
                            r"(?:\.\.?|~)?|"
                            r"[a-zA-Z]:"
-                           r")(\\|/)[^\\/]",)
+                           r")(\\|/)[^\\/]")
 
   @classmethod
   def value_has_path_prefix(cls, value: str) -> bool:
@@ -52,13 +51,6 @@ def path(cls,
     if not path_value:
       raise argparse.ArgumentTypeError("Invalid empty path.")
     try:
-      # Some tests (e.g. powerline) use locally-hosted web servers
-      if str(path_value).startswith("${crossbench_root}"):
-        dirname = os.path.abspath(
-          os.path.join(
-            os.path.dirname(__file__), os.path.pardir
-          ))
-        path_value = str(path_value).replace("${crossbench_root}", dirname, 1)
       path = pth.LocalPath(path_value).expanduser()
     except RuntimeError as e:
       raise argparse.ArgumentTypeError(