Memory Infra: Replace memory_health_plan with top_10_mobile

tools/perf/benchmarks/memory_infra.py

Index: tools/perf/benchmarks/memory_infra.py
diff --git a/tools/perf/benchmarks/memory_infra.py b/tools/perf/benchmarks/memory_infra.py
index c152bf4a2b018cde33f99f5acd6d76d6227a7f82..8f2ae68bca57b3a7d868afaa7642b14241c75421 100644
--- a/tools/perf/benchmarks/memory_infra.py
+++ b/tools/perf/benchmarks/memory_infra.py
@@ -57,13 +57,18 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
 # TODO(bashi): Workaround for http://crbug.com/532075
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
-class MemoryHealthQuick(_MemoryInfra):
-  """Timeline based benchmark for the Memory Health Plan (1 iteration)."""
-  page_set = page_sets.MemoryHealthStory
+class MemoryBenchmarkTop10Mobile(_MemoryInfra):
+  """Measure foreground/background memory on top 10 mobile page set.
+
+  This metric provides memory measurements for the System Health Plan of
+  Chrome on Android.
+  """
+  page_set = page_sets.MemoryTop10Mobile
+  options = {'pageset_repeat': 5}
 
   @classmethod
   def Name(cls):
-    return 'memory.memory_health_quick'
+    return 'memory.top_10_mobile'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
@@ -72,20 +77,11 @@ class MemoryHealthQuick(_MemoryInfra):
         'com.google.android.deskclock')
 
 
-# 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 TBMv2MemoryBenchmarkTop10Mobile(MemoryHealthQuick):
-  """Timeline based benchmark for the Memory Health Plan based on TBMv2.
+class TBMv2MemoryBenchmarkTop10Mobile(MemoryBenchmarkTop10Mobile):
+  """Measure foreground/background memory on top 10 mobile page set (TBMv2).
 
   This is a temporary benchmark to compare the new TBMv2 memory metric
   (memory_metric.html) with the existing TBMv1 one (memory_timeline.py). Once
@@ -130,19 +126,6 @@ class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
     return bool(cls._RE_RENDERER_VALUES.match(value.name))
 
 
-# Disabled on reference builds because they don't support the new

[perezju, 2016/04/29 12:58:06]

Ignore this bit, this should happen at
https://codereview.chromium.org/1936493002/

-# Tracing.requestMemoryDump DevTools API. See http://crbug.com/540022.
-@benchmark.Disabled('reference')
-class MemoryBenchmarkTop10Mobile(_MemoryInfra):
-  """Timeline based benchmark for measuring memory on top 10 mobile sites."""
-
-  page_set = page_sets.MemoryInfraTop10MobilePageSet
-
-  @classmethod
-  def Name(cls):
-    return 'memory.top_10_mobile'
-
-
 class _MemoryV8Benchmark(_MemoryInfra):
   def CreateTimelineBasedMeasurementOptions(self):
     v8_categories = [
@@ -155,7 +138,6 @@ class _MemoryV8Benchmark(_MemoryInfra):
     return options
 
 
-
 # Disabled on reference builds because they don't support the new
 # Tracing.requestMemoryDump DevTools API.
 # For 'reference' see http://crbug.com/540022.