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

tools/perf/benchmarks/system_health.py

Index: tools/perf/benchmarks/system_health.py
diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
index ee54dd98a57596cba1ed2e96c8d937c9576e55b8..d7b080a796ceb4cfb95027e404e23cb46cabe180 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py
@@ -7,7 +7,6 @@
 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
 
@@ -64,15 +63,19 @@
   https://goo.gl/Jek2NL.
   """
 
+  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):
     options = timeline_based_measurement.Options(
         chrome_trace_category_filter.ChromeTraceCategoryFilter(
             '-*,disabled-by-default-memory-infra'))
     options.config.enable_android_graphics_memtrack = True
     options.SetTimelineBasedMetrics(['memoryMetric'])
-    # Setting an empty memory dump config disables periodic dumps.
-    options.config.chrome_trace_config.SetMemoryDumpConfig(
-        chrome_trace_config.MemoryDumpConfig())
     return options
 
   def CreateStorySet(self, options):