| Index: tools/perf/benchmarks/memory_health_plan.py
|
| diff --git a/tools/perf/benchmarks/memory_health_plan.py b/tools/perf/benchmarks/memory_health_plan.py
|
| index 14be34cbf3f10ca62aec10f793ad8f95beee3e28..0d44df8d934882af65e1e2e9f06c0152f26b3c15 100644
|
| --- a/tools/perf/benchmarks/memory_health_plan.py
|
| +++ b/tools/perf/benchmarks/memory_health_plan.py
|
| @@ -7,8 +7,6 @@ import re
|
| from core import perf_benchmark
|
|
|
| from telemetry import benchmark
|
| -from telemetry.timeline import tracing_category_filter
|
| -from telemetry.web_perf import timeline_based_measurement
|
|
|
| import page_sets
|
|
|
| @@ -17,23 +15,11 @@ RE_BENCHMARK_VALUES = re.compile('(fore|back)ground-memory_')
|
|
|
|
|
| @benchmark.Enabled('android')
|
| -class MemoryHealthPlan(perf_benchmark.PerfBenchmark):
|
| +class MemoryHealthPlan(perf_benchmark._MemoryBenchmark):
|
| """Timeline based benchmark for the Memory Health Plan."""
|
|
|
| page_set = page_sets.MemoryHealthStory
|
|
|
| - def SetExtraBrowserOptions(self, options):
|
| - # TODO(perezju): Temporary workaround to disable periodic memory dumps.
|
| - # See: http://crbug.com/513692
|
| - options.AppendExtraBrowserArgs('--enable-memory-benchmarking')
|
| -
|
| - def CreateTimelineBasedMeasurementOptions(self):
|
| - # Enable only memory-infra, to get memory dumps, and blink.console, to get
|
| - # the timeline markers used for mapping threads to tabs.
|
| - trace_memory = tracing_category_filter.TracingCategoryFilter(
|
| - filter_string='-*,blink.console,disabled-by-default-memory-infra')
|
| - return timeline_based_measurement.Options(overhead_level=trace_memory)
|
| -
|
| @classmethod
|
| def Name(cls):
|
| return 'memory.memory_health_plan'
|
|
|