Index: tools/perf/benchmarks/kraken.py |
diff --git a/tools/perf/benchmarks/kraken.py b/tools/perf/benchmarks/kraken.py |
index db118b55697d3f1ebd7b76ad36081cd33c81da64..aefdaf66ffcf904180f1be175c6c007a67e0a2a7 100644 |
--- a/tools/perf/benchmarks/kraken.py |
+++ b/tools/perf/benchmarks/kraken.py |
@@ -6,10 +6,10 @@ |
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 |
from telemetry.value import scalar |
@@ -65,12 +65,13 @@ def _Mean(l): |
return float(sum(l)) / len(l) if len(l) > 0 else 0.0 |
-class _KrakenMeasurement(page_test.PageTest): |
+class _KrakenMeasurement(PageTestMeasurement): |
def __init__(self): |
super(_KrakenMeasurement, self).__init__() |
self._power_metric = None |
def CustomizeBrowserOptions(self, options): |
+ super(_KrakenMeasurement, self).CustomizeBrowserOptions(options) |
power.PowerMetric.CustomizeBrowserOptions(options) |
def WillStartBrowser(self, platform): |
@@ -108,6 +109,7 @@ class _KrakenMeasurement(page_test.PageTest): |
description='Total of the means of the results for each type ' |
'of benchmark in [Mozilla\'s Kraken JavaScript benchmark]' |
'(http://krakenbenchmark.mozilla.org/)')) |
+ super(_KrakenMeasurement, self).ValidateAndMeasurePage(page, tab, results) |
class Kraken(benchmark.Benchmark): |