[tools/perf] Remove memory.memory_health_quick

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 36 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 MemoryHealthQuick(_MemoryInfra):
-  """Timeline based benchmark for the Memory Health Plan (1 iteration)."""
+# 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.memory_health_quick'
+    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')
 
 
-# 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'
-
-
 @benchmark.Enabled('android')
-class TBMv2MemoryBenchmarkTop10Mobile(MemoryHealthQuick):
+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 83 matching lines @@
 # For 'android' see http://crbug.com/579546.
 @benchmark.Disabled('reference', 'android')
 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'