[tools/perf] Remove trace rerun options from dual browser 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
@@ skipping 93 matching lines @@
 
 # Benchmark is disabled by default because it takes too long to run.
 @benchmark.Disabled('all')
 class DualBrowserBenchmark(_MemoryInfra):
   """Measures memory usage while interacting with two different browsers.
 
   The user story involves going back and forth between doing Google searches
   on a webview-based browser (a stand in for the Search app), and loading
   pages on a select browser.
   """
+  TBM_VERSION = 2
   page_set = page_sets.DualBrowserStorySet
   options = {'pageset_repeat': 5}
 
   @classmethod
   def Name(cls):
     return 'memory.dual_browser_test'
 
-  def SetupBenchmarkDefaultTraceRerunOptions(self, tbm_options):
-    # This is a TBMv2 benchmark.
-    tbm_options.SetTimelineBasedMetric('memoryMetric')
-
 
 # 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')
 
@@ skipping 44 matching lines @@
         memory_timeline.MemoryTimelineMetric(),
     ))
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_tbm'
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True