Index: tools/perf/measurements/page_cycler.py |
diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py |
index d70b9110dcbe20518aaac9b306cf5f0ee7aebe63..ee145e8faf68413fb7f6216b06b40c5c9341a1f0 100644 |
--- a/tools/perf/measurements/page_cycler.py |
+++ b/tools/perf/measurements/page_cycler.py |
@@ -18,6 +18,7 @@ cycling all pages. |
import collections |
import os |
+from measurements import PageTestMeasurement |
from metrics import cpu |
from metrics import iometric |
from metrics import memory |
@@ -25,11 +26,10 @@ from metrics import power |
from metrics import speedindex |
from metrics import v8_object_stats |
from telemetry.core import util |
-from telemetry.page import page_test |
from telemetry.value import scalar |
-class PageCycler(page_test.PageTest): |
+class PageCycler(PageTestMeasurement): |
options = {'pageset_repeat': 10} |
def __init__(self, *args, **kwargs): |
@@ -118,6 +118,7 @@ class PageCycler(page_test.PageTest): |
self._v8_object_stats_metric.Start(page, tab) |
def CustomizeBrowserOptions(self, options): |
+ super(PageCycler, self).CustomizeBrowserOptions(options) |
memory.MemoryMetric.CustomizeBrowserOptions(options) |
power.PowerMetric.CustomizeBrowserOptions(options) |
iometric.IOMetric.CustomizeBrowserOptions(options) |
@@ -129,6 +130,7 @@ class PageCycler(page_test.PageTest): |
self._speedindex_metric.CustomizeBrowserOptions(options) |
def ValidateAndMeasurePage(self, page, tab, results): |
+ super(PageCycler, self).ValidateAndMeasurePage(page, tab, results) |
tab.WaitForJavaScriptExpression('__pc_load_time', 60) |
chart_name_prefix = ('cold_' if self.IsRunCold(page.url) else |