Reland of Port memory.long_running_idle_gmail benchmarks to TBMv2.

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 1c89590bd8fa98ac2d99fb8871fecaf56eaee430..f82016792db1f2f84ecee05be11148a6d7528a26 100644
--- a/tools/perf/benchmarks/memory_infra.py
+++ b/tools/perf/benchmarks/memory_infra.py
@@ -10,7 +10,6 @@ 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
 
@@ -152,37 +151,43 @@ class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
     return bool(cls._RE_RENDERER_VALUES.match(value.name))
 
 
+class _MemoryV8Benchmark(_MemoryInfra):
+  def CreateTimelineBasedMeasurementOptions(self):
+    v8_categories = [
+        'blink.console', 'renderer.scheduler', 'v8', 'webkit.console']
+    memory_categories = ['blink.console', 'disabled-by-default-memory-infra']
+    category_filter = tracing_category_filter.TracingCategoryFilter(
+        ','.join(['-*'] + v8_categories + memory_categories))
+    options = timeline_based_measurement.Options(category_filter)
+    options.SetTimelineBasedMetric('v8AndMemoryMetrics')
+    return options
+
+
 # Disabled on reference builds because they don't support the new
 # Tracing.requestMemoryDump DevTools API.
 # For 'reference' see http://crbug.com/540022.
 # For 'android' see http://crbug.com/579546.
 @benchmark.Disabled('reference', 'android')
-class MemoryLongRunningIdleGmailTBM(_MemoryInfra):
+class MemoryLongRunningIdleGmail(_MemoryV8Benchmark):
   """Use (recorded) real world web sites and measure memory consumption
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailPageSet
 
-  def CreateTimelineBasedMeasurementOptions(self):
-    v8_categories = [
-        'blink.console', 'renderer.scheduler', 'v8', 'webkit.console']
-    memory_categories = 'blink.console,disabled-by-default-memory-infra'
-    category_filter = tracing_category_filter.TracingCategoryFilter(
-        memory_categories)
-    for category in v8_categories:
-      category_filter.AddIncludedCategory(category)
-    options = timeline_based_measurement.Options(category_filter)
-    return options
-
-  def SetupBenchmarkDefaultTraceRerunOptions(self, tbm_options):
-    tbm_options.SetLegacyTimelineBasedMetrics((
-        v8_gc_latency.V8GCLatency(),
-        memory_timeline.MemoryTimelineMetric(),
-    ))
-
   @classmethod
   def Name(cls):
-    return 'memory.long_running_idle_gmail_tbm'
+    return 'memory.long_running_idle_gmail_tbmv2'
+
+
+# Disabled on reference builds because they don't support the new
+# Tracing.requestMemoryDump DevTools API.
+# For 'reference' see http://crbug.com/540022.
+# 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 ShouldTearDownStateAfterEachStoryRun(cls):
-    return True
+  def Name(cls):
+    return 'memory.long_running_idle_gmail_background_tbmv2'