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

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 benchmarks import page_cycler_v2
 
 from core import perf_benchmark
 
@@ skipping 47 matching lines @@
 class DesktopCommonSystemHealth(_CommonSystemHealthBenchmark):
   """Desktop Chrome Energy System Health Benchmark."""
   PLATFORM = 'desktop'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/624355 (reference builds).
     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.
 
   This test suite is run separately from the common one due to the high overhead
   of memory tracing.
 
   https://goo.gl/Jek2NL.
   """
   options = {'pageset_repeat': 3}
 
@@ skipping 31 matching lines @@
   """Desktop Chrome Memory System Health Benchmark."""
   PLATFORM = 'desktop'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/624355 (reference builds).
     return (possible_browser.platform.GetDeviceTypeName() != 'Desktop' or
             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
     # the next story run is effected. Due to this the first story run
     # has anomalous results. This option causes us to flush caches
     # each time before Chrome starts so we effect even the first story
     # - avoiding the bug.
     options.clear_sytem_cache_for_browser_and_profile_on_start = True
 
 
@@ skipping 37 matching lines @@
   and load a blank page with multiprocess enabled.
   """
 
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs(
         ['--webview-sandboxed-renderer'])
 
   @classmethod
   def Name(cls):
     return 'system_health.webview_startup_multiprocess'