| Index: tools/perf/benchmarks/speedometer.py
|
| diff --git a/tools/perf/benchmarks/speedometer.py b/tools/perf/benchmarks/speedometer.py
|
| index 5de0c1e0fc4ca82032e695f8a4de6a6c0487bfae..83b31ea99d19bd62b48c5ef9bc84c1eb5dbbcd35 100644
|
| --- a/tools/perf/benchmarks/speedometer.py
|
| +++ b/tools/perf/benchmarks/speedometer.py
|
| @@ -21,17 +21,19 @@ import os
|
| from telemetry import benchmark
|
| from telemetry.page import page_measurement
|
| from telemetry.page import page_set
|
| +from telemetry.value import list_of_scalar_values
|
|
|
|
|
| class SpeedometerMeasurement(page_measurement.PageMeasurement):
|
|
|
| - def MeasurePage(self, _, tab, results):
|
| + def MeasurePage(self, page, tab, results):
|
| tab.WaitForDocumentReadyStateToBeComplete()
|
| tab.ExecuteJavaScript('benchmarkClient.iterationCount = 10; startTest();')
|
| tab.WaitForJavaScriptExpression(
|
| 'benchmarkClient._finishedTestCount == benchmarkClient.testsCount', 600)
|
| - results.Add(
|
| - 'Total', 'ms', tab.EvaluateJavaScript('benchmarkClient._timeValues'))
|
| + results.AddValue(list_of_scalar_values.ListOfScalarValues(
|
| + page, 'Total', 'ms',
|
| + tab.EvaluateJavaScript('benchmarkClient._timeValues')))
|
|
|
|
|
| @benchmark.Disabled('android') # Times out
|
|
|