Revert of Set up a parallel memory.memory_health_quick_tbmv2 benchmark

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
 from telemetry.web_perf import timeline_based_measurement
 from telemetry.web_perf.metrics import memory_timeline
 from telemetry.web_perf.metrics import v8_gc_latency
 
 import page_sets
 
 
 class _MemoryInfra(perf_benchmark.PerfBenchmark):
   """Base class for new-generation memory benchmarks based on memory-infra.
 
   This benchmark records data using memory-infra (https://goo.gl/8tGc6O), which
   is part of chrome tracing, and extracts it using timeline-based measurements.
   """
 
-  # Subclasses can override this to use TBMv2 instead of TBMv1.
-  TBM_VERSION = 1
-
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs([
         # TODO(perezju): Temporary workaround to disable periodic memory dumps.
         # See: http://crbug.com/513692
         '--enable-memory-benchmarking',
     ])
 
   def CreateTimelineBasedMeasurementOptions(self):
     # Enable only memory-infra, to get memory dumps, and blink.console, to get
     # the timeline markers used for mapping threads to tabs.
     trace_memory = tracing_category_filter.TracingCategoryFilter(
         filter_string='-*,blink.console,disabled-by-default-memory-infra')
     tbm_options = timeline_based_measurement.Options(
         overhead_level=trace_memory)
     tbm_options.config.enable_android_graphics_memtrack = True
-    if self.TBM_VERSION == 1:
-      # TBMv1 (see telemetry/telemetry/web_perf/metrics/memory_timeline.py
-      # in third_party/catapult).
-      tbm_options.SetLegacyTimelineBasedMetrics((
-          memory_timeline.MemoryTimelineMetric(),
-      ))
-    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
 
+  @classmethod
+  def HasTraceRerunDebugOption(cls):
+    return True
+
+  def SetupBenchmarkDefaultTraceRerunOptions(self, tbm_options):
+    tbm_options.SetLegacyTimelineBasedMetrics((
+        memory_timeline.MemoryTimelineMetric(),
+    ))
+
 
 # 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
 
   @classmethod
   def Name(cls):
@@ skipping 10 matching lines @@
 @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):
-  """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
-
-  @classmethod
-  def Name(cls):
-    return 'memory.top_10_mobile_tbmv2'
-
-
 # TODO(bashi): Workaround for http://crbug.com/532075
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
 class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
   """Timeline based benchmark for measuring memory consumption on mobile
   sites on which blink's memory consumption is relatively high."""
 
   _RE_RENDERER_VALUES = re.compile('memory_.+_renderer')
 
   page_set = page_sets.BlinkMemoryMobilePageSet
@@ skipping 56 matching lines @@
         memory_timeline.MemoryTimelineMetric(),
     ))
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_tbm'
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True