| Index: tools/perf/benchmarks/octane.py
|
| diff --git a/tools/perf/benchmarks/octane.py b/tools/perf/benchmarks/octane.py
|
| index 47917800ff0bb7a983daad2e562fcffd51373363..691deca38c2ce31fea3932f74b74241e7e28d72b 100644
|
| --- a/tools/perf/benchmarks/octane.py
|
| +++ b/tools/perf/benchmarks/octane.py
|
| @@ -13,10 +13,10 @@ Octane 2.0 consists of 17 tests, four more than Octane v1.
|
|
|
| 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.util import statistics
|
| from telemetry.value import scalar
|
|
|
| @@ -64,12 +64,13 @@ DESCRIPTIONS = {
|
| }
|
|
|
|
|
| -class _OctaneMeasurement(page_test.PageTest):
|
| +class _OctaneMeasurement(PageTestMeasurement):
|
| def __init__(self):
|
| super(_OctaneMeasurement, self).__init__()
|
| self._power_metric = None
|
|
|
| def CustomizeBrowserOptions(self, options):
|
| + super(_OctaneMeasurement, self).CustomizeBrowserOptions(options)
|
| power.PowerMetric.CustomizeBrowserOptions(options)
|
|
|
| def WillStartBrowser(self, platform):
|
| @@ -125,6 +126,7 @@ class _OctaneMeasurement(page_test.PageTest):
|
| description='Geometric mean of the scores of each '
|
| 'individual benchmark in the Octane '
|
| 'benchmark collection.'))
|
| + super(_OctaneMeasurement, self).ValidateAndMeasurePage(page, tab, results)
|
|
|
|
|
| class Octane(benchmark.Benchmark):
|
|
|