[perf] Re-enable system_health.memory_* benchmarks

tools/perf/benchmarks/system_health.py

 # Copyright 2016 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 tracing_category_filter
 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'_(std|count|max|min|sum|pct_\d{4}(_\d+)?)$')
+
+
 class _SystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   TRACING_CATEGORIES = [
     'benchmark',
     'navigation',
     'blink.user_timing',
   ]
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.config.SetTracingCategoryFilter(
@@ skipping 45 matching lines @@
         tracing_category_filter.TracingCategoryFilter(
             '-*,disabled-by-default-memory-infra'))
     options.config.enable_android_graphics_memtrack = True
     options.SetTimelineBasedMetric('memoryMetric')
     return options
 
   @classmethod
   def Name(cls):
     return 'system_health.memory_%s' % cls.page_set.PLATFORM
 
-# https://github.com/catapult-project/catapult/issues/2340
-@benchmark.Disabled('all')
+  @classmethod
+  def ValueCanBeAddedPredicate(cls, value, is_first_result):
+    # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard
+    # is able to cope with the data load generated by TBMv2 metrics.
+    return not _IGNORED_STATS_RE.search(value.name)
+
+
 class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark):
   """Desktop Chrome Memory System Health Benchmark."""
   page_set = page_sets.DesktopMemorySystemHealthStorySet
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return possible_browser.platform.GetDeviceTypeName() != 'Desktop'
 
-# https://github.com/catapult-project/catapult/issues/2340
-@benchmark.Disabled('all')
+
 class MobileMemorySystemHealth(_MemorySystemHealthBenchmark):
   """Mobile Chrome Memory System Health Benchmark."""
   page_set = page_sets.MobileMemorySystemHealthStorySet
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/612144 (reference on Nexus 5X).
     return possible_browser.platform.GetDeviceTypeName() == 'Desktop' or (
         possible_browser.browser_type == 'reference' and
         possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')