| Index: tools/perf/benchmarks/sunspider.py
|
| diff --git a/tools/perf/benchmarks/sunspider.py b/tools/perf/benchmarks/sunspider.py
|
| index ab1c2dd675c4cfc770e904adcee9b53ca58579d5..2a454b40761ff40e73235820b16b92ebd40e10be 100644
|
| --- a/tools/perf/benchmarks/sunspider.py
|
| +++ b/tools/perf/benchmarks/sunspider.py
|
| @@ -5,10 +5,10 @@ import collections
|
| import json
|
| import os
|
|
|
| +from measurements import PageTestMeasurement
|
| from metrics import power
|
| from telemetry import benchmark
|
| from telemetry.page import page_set
|
| -from telemetry.page import page_test
|
| from telemetry.value import list_of_scalar_values
|
|
|
|
|
| @@ -72,12 +72,13 @@ DESCRIPTIONS = {
|
| }
|
|
|
|
|
| -class _SunspiderMeasurement(page_test.PageTest):
|
| +class _SunspiderMeasurement(PageTestMeasurement):
|
| def __init__(self):
|
| super(_SunspiderMeasurement, self).__init__()
|
| self._power_metric = None
|
|
|
| def CustomizeBrowserOptions(self, options):
|
| + super(_SunspiderMeasurement, self).CustomizeBrowserOptions(options)
|
| power.PowerMetric.CustomizeBrowserOptions(options)
|
|
|
| def WillStartBrowser(self, platform):
|
| @@ -121,6 +122,8 @@ class _SunspiderMeasurement(page_test.PageTest):
|
| results.current_page, 'Total', 'ms', totals,
|
| description='Totals of run time for each different type of benchmark '
|
| 'in sunspider'))
|
| + super(_SunspiderMeasurement, self).ValidateAndMeasurePage(
|
| + page, tab, results)
|
|
|
|
|
| class Sunspider(benchmark.Benchmark):
|
|
|