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

tools/perf/benchmarks/memory_infra.py

Index: tools/perf/benchmarks/memory_infra.py
diff --git a/tools/perf/benchmarks/memory_infra.py b/tools/perf/benchmarks/memory_infra.py
index dbdf226d36cf5ba348adb2f378d5a74caf4a9815..f371f44d753891d4a7a0518b7b33f69f8c532e16 100644
--- a/tools/perf/benchmarks/memory_infra.py
+++ b/tools/perf/benchmarks/memory_infra.py
@@ -8,7 +8,6 @@
 
 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
@@ -26,6 +25,13 @@
   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
@@ -36,9 +42,6 @@
         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
 
 
@@ -179,9 +182,6 @@
         ','.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