Reland of [telemetry] Trace config should be used to disable periodic dumps

tools/perf/benchmarks/memory_infra.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.timeline import chrome_trace_category_filter
+from telemetry.timeline import chrome_trace_config
 from telemetry.web_perf import timeline_based_measurement
 
 import page_sets
 
 
 # See tr.v.Numeric.getSummarizedScalarNumericsWithNames()
 # https://github.com/catapult-project/catapult/blob/master/tracing/tracing/value/numeric.html#L323
 _IGNORED_STATS_RE = re.compile(
     r'(?<!dump)(?<!process)_(std|count|max|min|sum|pct_\d{4}(_\d+)?)$')
 
 
 class _MemoryInfra(perf_benchmark.PerfBenchmark):
   """Base class for new-generation memory benchmarks based on memory-infra.
 
   This benchmark records data using memory-infra (https://goo.gl/8tGc6O), which
   is part of chrome tracing, and extracts it using timeline-based measurements.
   """
 
-  def SetExtraBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs([
-        # TODO(perezju): Temporary workaround to disable periodic memory dumps.
-        # See: http://crbug.com/513692
-        '--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 = chrome_trace_category_filter.ChromeTraceCategoryFilter(
         filter_string='-*,blink.console,disabled-by-default-memory-infra')
     tbm_options = timeline_based_measurement.Options(
         overhead_level=trace_memory)
     tbm_options.config.enable_android_graphics_memtrack = True
     tbm_options.SetTimelineBasedMetrics(['memoryMetric'])
+    # Setting an empty memory dump config disables periodic dumps.
+    tbm_options.config.chrome_trace_config.SetMemoryDumpConfig(
+        chrome_trace_config.MemoryDumpConfig())
     return tbm_options
 
 
 # TODO(bashi): Workaround for http://crbug.com/532075.
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
 class MemoryBenchmarkTop10Mobile(_MemoryInfra):
   """Measure foreground/background memory on top 10 mobile page set.
 
   This metric provides memory measurements for the System Health Plan of
@@ skipping 140 matching lines @@
       r'(reported_by_chrome:v8|reported_by_os:system_memory:[^:]+$)')
 
   def CreateTimelineBasedMeasurementOptions(self):
     v8_categories = [
         'blink.console', 'renderer.scheduler', 'v8', 'webkit.console']
     memory_categories = ['blink.console', 'disabled-by-default-memory-infra']
     category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
         ','.join(['-*'] + v8_categories + memory_categories))
     options = timeline_based_measurement.Options(category_filter)
     options.SetTimelineBasedMetrics(['v8AndMemoryMetrics'])
+    # Setting an empty memory dump config disables periodic dumps.
+    options.config.chrome_trace_config.SetMemoryDumpConfig(
+        chrome_trace_config.MemoryDumpConfig())
     return options
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, _):
     if 'memory:chrome' in value.name:
       # TODO(petrcermak): Remove the first two cases once
       # https://codereview.chromium.org/2018503002/ lands in Catapult and rolls
       # into Chromium.
       return ('renderer:subsystem:v8' in value.name or
               'renderer:vmstats:overall' in value.name or
@@ skipping 21 matching lines @@
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/616530
     return cls.IsSvelte(possible_browser)