Revert of Memory Infra: Replace memory_health_plan with top_10_mobile

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 41 matching lines @@
       ))
     elif self.TBM_VERSION == 2:
       # TBMv2 (see tracing/tracing/metrics/system_health/memory_metric.html
       # in third_party/catapult).
       tbm_options.SetTimelineBasedMetric('memoryMetric')
     else:
       raise Exception('Unrecognized TBM version: %s' % self.TBM_VERSION)
     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):
     # TODO(crbug.com/586148): Benchmark should not depend on DeskClock app.
     return not possible_browser.platform.CanLaunchApplication(
         '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
   all issues associated with the TBMv2 metric are resolved, all memory
   benchmarks (including the ones in this file) will switch to use it instead
   of the TBMv1 metric and this temporary benchmark will be removed. See
   crbug.com/60361.
   """
   TBM_VERSION = 2
 
@@ skipping 89 matching lines @@
 
 @benchmark.Enabled('has tabs')  # http://crbug.com/612210
 class MemoryLongRunningIdleGmailBackground(_MemoryV8Benchmark):
   """Use (recorded) real world web sites and measure memory consumption
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'