| Index: tools/perf/measurements/memory_multi_tab.py
|
| diff --git a/tools/perf/measurements/memory_multi_tab.py b/tools/perf/measurements/memory_multi_tab.py
|
| index e6891512d5beb1244fa2c83f416bae999314560d..32b7d41ddeb59c71e6cd89bd9b5e45b4cac386c8 100644
|
| --- a/tools/perf/measurements/memory_multi_tab.py
|
| +++ b/tools/perf/measurements/memory_multi_tab.py
|
| @@ -8,11 +8,10 @@ This test is a multi tab test, but we're interested in measurements for
|
| the entire test rather than each single page.
|
| """
|
|
|
| -
|
| +from measurements import PageTestMeasurement
|
| from metrics import memory
|
| -from telemetry.page import page_test
|
|
|
| -class MemoryMultiTab(page_test.PageTest):
|
| +class MemoryMultiTab(PageTestMeasurement):
|
| def __init__(self, *args, **kwargs):
|
| super(MemoryMultiTab, self).__init__(*args, **kwargs)
|
| self._memory_metric = None
|
| @@ -23,6 +22,7 @@ class MemoryMultiTab(page_test.PageTest):
|
| self._memory_metric = memory.MemoryMetric(browser)
|
|
|
| def CustomizeBrowserOptions(self, options):
|
| + super(MemoryMultiTab, self).CustomizeBrowserOptions(options)
|
| memory.MemoryMetric.CustomizeBrowserOptions(options)
|
| # Since this is a memory benchmark, we want to sample memory histograms at
|
| # a high frequency.
|
| @@ -38,6 +38,8 @@ class MemoryMultiTab(page_test.PageTest):
|
| self._first_tab = tab
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| + super(MemoryMultiTab, self).ValidateAndMeasurePage(page, tab, results)
|
| +
|
| # Finalize measurement on the last tab.
|
| if len(tab.browser.tabs) == len(page.page_set.pages):
|
| self._memory_metric.Stop(page, self._first_tab)
|
|
|