| Index: tools/perf/measurements/memory.py
|
| diff --git a/tools/perf/measurements/memory.py b/tools/perf/measurements/memory.py
|
| index a9cfb8d601154de1a98bf53a19abd94b956ad0bc..33ff4bb25f1ed05c21bde12abb2f362543c61859 100644
|
| --- a/tools/perf/measurements/memory.py
|
| +++ b/tools/perf/measurements/memory.py
|
| @@ -2,11 +2,11 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +from measurements import PageTestMeasurement
|
| from metrics import memory
|
| from metrics import power
|
| -from telemetry.page import page_test
|
|
|
| -class Memory(page_test.PageTest):
|
| +class Memory(PageTestMeasurement):
|
| def __init__(self):
|
| super(Memory, self).__init__('RunPageInteractions')
|
| self._memory_metric = None
|
| @@ -23,12 +23,14 @@ class Memory(page_test.PageTest):
|
| self._power_metric.Start(page, tab)
|
|
|
| def CustomizeBrowserOptions(self, options):
|
| + super(Memory, self).CustomizeBrowserOptions(options)
|
| memory.MemoryMetric.CustomizeBrowserOptions(options)
|
| # Since this is a memory benchmark, we want to sample memory histograms at
|
| # a high frequency.
|
| options.AppendExtraBrowserArgs('--memory-metrics')
|
|
|
| def ValidateAndMeasurePage(self, page, tab, results):
|
| + super(Memory, self).ValidateAndMeasurePage(page, tab, results)
|
| self._power_metric.Stop(page, tab)
|
| self._memory_metric.Stop(page, tab)
|
| self._memory_metric.AddResults(tab, results)
|
|
|