| Index: tools/perf/benchmarks/memory_infra.py
|
| diff --git a/tools/perf/benchmarks/memory_infra.py b/tools/perf/benchmarks/memory_infra.py
|
| index 801dd47e90875fa157647f2a38b3fdd990eda5b4..2df5b0e277d4308a583eee7e318d1b0809b0f6c1 100644
|
| --- a/tools/perf/benchmarks/memory_infra.py
|
| +++ b/tools/perf/benchmarks/memory_infra.py
|
| @@ -26,14 +26,16 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
|
| options.AppendExtraBrowserArgs([
|
| # TODO(perezju): Temporary workaround to disable periodic memory dumps.
|
| # See: http://crbug.com/513692
|
| - '--enable-memory-benchmarking',
|
| + # '--enable-memory-benchmarking',
|
| + '--no-sandbox',
|
| + '--enable-heap-profiling',
|
| ])
|
|
|
| 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')
|
| + filter_string='-*,blink.console,disabled-by-default-memory-infra,skia')
|
| tbm_options = timeline_based_measurement.Options(
|
| overhead_level=trace_memory)
|
| tbm_options.config.enable_android_graphics_memtrack = True
|
|
|