[system-health] Re-enable memory_mobile.reference on Nexus 5X.

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 2b013a55d969de3a2e8ba89bada91111a547542a..2ea35fb396fbe1d85bb4f41a2bf9fafb153a7ec7 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py
@@ -65,21 +65,11 @@ class DesktopCommonSystemHealth(_CommonSystemHealthBenchmark):
     return (possible_browser.platform.GetDeviceTypeName() != 'Desktop' or
             possible_browser.browser_type == 'reference')
 
-
+@benchmark.Enabled('android')
 class MobileCommonSystemHealth(_CommonSystemHealthBenchmark):
   """Mobile Chrome Energy System Health Benchmark."""
   PLATFORM = 'mobile'
 
-  @classmethod
-  def ShouldDisable(cls, possible_browser):
-    # http://crbug.com/612144
-    if (possible_browser.browser_type == 'reference' and
-        possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'):
-      return True
-
-    return possible_browser.platform.GetDeviceTypeName() == 'Desktop'
-
-
 class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   """Chrome Memory System Health Benchmark.
 
@@ -131,19 +121,11 @@ class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark):
             possible_browser.browser_type == 'reference')
 
 
+@benchmark.Enabled('android')
 class MobileMemorySystemHealth(_MemorySystemHealthBenchmark):
   """Mobile Chrome Memory System Health Benchmark."""
   PLATFORM = 'mobile'
 
-  @classmethod
-  def ShouldDisable(cls, possible_browser):
-    # http://crbug.com/612144
-    if (possible_browser.browser_type == 'reference' and
-        possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'):
-      return True
-
-    return possible_browser.platform.GetDeviceTypeName() == 'Desktop'
-
   def SetExtraBrowserOptions(self, options):
     # Just before we measure memory we flush the system caches
     # unfortunately this doesn't immediately take effect, instead