Reland of 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 a09e8acd834ba01d59787253c118915bee1f7aaf..495a9db8f3f255cb5b279a394b8b8339329da6bc 100644
--- a/tools/perf/benchmarks/memory_infra.py
+++ b/tools/perf/benchmarks/memory_infra.py
@@ -59,16 +59,21 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
     return tbm_options
 
 
-# TODO(crbug.com/606361): Remove benchmark when replaced by the TBMv2 version.
-@benchmark.Disabled('all')
-class MemoryHealthPlan(_MemoryInfra):
-  """Timeline based benchmark for the Memory Health Plan."""
-  page_set = page_sets.MemoryHealthStory
+# TODO(bashi): Workaround for http://crbug.com/532075.
+# @benchmark.Enabled('android') shouldn't be needed.
+@benchmark.Enabled('android')
+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_plan'
+    return 'memory.top_10_mobile'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
@@ -77,9 +82,20 @@ class MemoryHealthPlan(_MemoryInfra):
         'com.google.android.deskclock')
 
 
+#TODO(perezju): Remove when all bots are updated to the new benchmark name.

[petrcermak, 2016/05/26 09:51:23]

supernit: Missing space between '#' and 'TODO' O:-)

+@benchmark.Disabled('all')
+class MemoryHealthPlan(MemoryBenchmarkTop10Mobile):
+  """Alias of memory.top_10_mobile. (Deprecated)"""

[petrcermak, 2016/05/26 09:51:23]

supernit: I would put the period after the closing parenthesis (probably just a
matter of personal taste).

+  @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(MemoryHealthPlan):
-  """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