[Memory Health Plan] Set default --pageset-repeat value in the benchmark

tools/perf/benchmarks/memory_infra.py

 # Copyright 2015 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
@@ skipping 34 matching lines @@
 
   def SetupBenchmarkDefaultTraceRerunOptions(self, tbm_options):
     tbm_options.SetLegacyTimelineBasedMetrics((
         memory_timeline.MemoryTimelineMetric(),
     ))
 
 
 # TODO(bashi): Workaround for http://crbug.com/532075
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
-class MemoryHealthPlan(_MemoryInfra):
-  """Timeline based benchmark for the Memory Health Plan."""
-
-  _PREFIX_WHITELIST = ('memory_allocator_', 'memory_android_memtrack_',
-                       'memory_mmaps_', 'process_count_')
-
+class MemoryHealthQuick(_MemoryInfra):
+  """Timeline based benchmark for the Memory Health Plan (1 iteration)."""
   page_set = page_sets.MemoryHealthStory
 
   @classmethod
   def Name(cls):
-    return 'memory.memory_health_plan'
-
-  @classmethod
-  def ValueCanBeAddedPredicate(cls, value, is_first_result):
-    return (value.tir_label in ['foreground', 'background']
-            and any(value.name.startswith(p) for p in cls._PREFIX_WHITELIST))

[perezju, 2016/04/20 15:17:13]

Took the chance to remove this value filter. The benchmark has been already
cleaned up, so now it's only producing memory values anyway.

+    return 'memory.memory_health_quick'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # Benchmark requires DeskClock app only available on Nexus devices.
     # See http://crbug.com/546842
     return 'nexus' not in possible_browser.platform.GetDeviceTypeName().lower()
 
 
+# Benchmark is disabled by default because it takes too long to run.
+@benchmark.Disabled('all')
+class MemoryHealthPlan(MemoryHealthQuick):
+  """Timeline based benchmark for the Memory Health Plan (5 iterations)."""
+  options = {'pageset_repeat': 5}
+
+  @classmethod
+  def Name(cls):
+    return 'memory.memory_health_plan'
+
+
 # TODO(bashi): Workaround for http://crbug.com/532075
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
 class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
   """Timeline based benchmark for measuring memory consumption on mobile
   sites on which blink's memory consumption is relatively high."""
 
   _RE_RENDERER_VALUES = re.compile('memory_.+_renderer')
 
   page_set = page_sets.BlinkMemoryMobilePageSet
@@ skipping 56 matching lines @@
         memory_timeline.MemoryTimelineMetric(),
     ))
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_tbm'
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True