| Index: tools/perf/benchmarks/blink_perf.py
|
| diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
|
| index 20d3a025ebceeb4bfbb020b69684339d4fe674d4..71309e6b82f68e8e88455e81ba6abfd4e7ea3842 100644
|
| --- a/tools/perf/benchmarks/blink_perf.py
|
| +++ b/tools/perf/benchmarks/blink_perf.py
|
| @@ -4,10 +4,10 @@
|
|
|
| import os
|
|
|
| +from measurements import PageTestMeasurement
|
| from telemetry import benchmark
|
| from telemetry.core import util
|
| from telemetry.page import page_set
|
| -from telemetry.page import page_test
|
| from telemetry.value import list_of_scalar_values
|
|
|
|
|
| @@ -59,7 +59,7 @@ def _CreatePageSetFromPath(path, skipped_file):
|
| return ps
|
|
|
|
|
| -class _BlinkPerfMeasurement(page_test.PageTest):
|
| +class _BlinkPerfMeasurement(PageTestMeasurement):
|
| """Tuns a blink performance test and reports the results."""
|
| def __init__(self):
|
| super(_BlinkPerfMeasurement, self).__init__('')
|
| @@ -71,6 +71,7 @@ class _BlinkPerfMeasurement(page_test.PageTest):
|
| page.script_to_evaluate_on_commit = self._blink_perf_js
|
|
|
| def CustomizeBrowserOptions(self, options):
|
| + super(_BlinkPerfMeasurement, self).CustomizeBrowserOptions(options)
|
| options.AppendExtraBrowserArgs([
|
| '--js-flags=--expose_gc',
|
| '--enable-experimental-web-platform-features',
|
| @@ -78,6 +79,8 @@ class _BlinkPerfMeasurement(page_test.PageTest):
|
| ])
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| + super(_BlinkPerfMeasurement, self).ValidateAndMeasurePage(
|
| + page, tab, results)
|
| tab.WaitForJavaScriptExpression('testRunner.isDone', 600)
|
|
|
| log = tab.EvaluateJavaScript('document.getElementById("log").innerHTML')
|
|
|