Revert 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 22ee079de8d24b58d89b1184e9febfa7c3596d2e..a09e8acd834ba01d59787253c118915bee1f7aaf 100644
--- a/tools/perf/benchmarks/memory_infra.py
+++ b/tools/perf/benchmarks/memory_infra.py
@@ -59,21 +59,16 @@
     return tbm_options
 
 
-# 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
+# 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
   options = {'pageset_repeat': 5}
 
   @classmethod
   def Name(cls):
-    return 'memory.top_10_mobile'
+    return 'memory.memory_health_plan'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
@@ -82,11 +77,9 @@
         'com.google.android.deskclock')
 
 
-# TODO(bashi): Workaround for http://crbug.com/532075.
-# @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
-class TBMv2MemoryBenchmarkTop10Mobile(MemoryBenchmarkTop10Mobile):
-  """Measure foreground/background memory on top 10 mobile page set (TBMv2).
+class TBMv2MemoryBenchmarkTop10Mobile(MemoryHealthPlan):
+  """Timeline based benchmark for the Memory Health Plan based on 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