Add memory metrics to TBMv2 media benchmarks

tools/perf/benchmarks/media.py

 # Copyright 2014 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.
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.page import legacy_page_test
 from telemetry.timeline import chrome_trace_category_filter
+from telemetry.timeline import chrome_trace_config
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
 from telemetry.web_perf import timeline_based_measurement
 
 from measurements import media
 import page_sets
 
 
 class _MSEMeasurement(legacy_page_test.LegacyPageTest):
 
@@ skipping 47 matching lines @@
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)
 
   @classmethod
   def Name(cls):
     return 'media.android.tough_video_cases'
 
 
 class _MediaTBMv2Benchmark(perf_benchmark.PerfBenchmark):
-  page_set = page_sets.ToughVideoCasesPageSet
+  def CreateStorySet(self, options):
+    return page_sets.ToughVideoCasesPageSet(measure_memory=True)
 
   def CreateTimelineBasedMeasurementOptions(self):
     category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
 
     # 'toplevel' category provides CPU time slices used by # cpuTimeMetric.
     category_filter.AddIncludedCategory('toplevel')
 
     # 'rail' category is used by powerMetric to attribute different period of
     # time to different activities, such as video_animation, etc.
     category_filter.AddIncludedCategory('rail')
 
+    # Collect memory data.
+    category_filter.AddDisabledByDefault('disabled-by-default-memory-infra')
+
     options = timeline_based_measurement.Options(category_filter)
     options.config.enable_battor_trace = True
-    options.SetTimelineBasedMetrics(['powerMetric', 'cpuTimeMetric'])
+    options.config.enable_android_graphics_memtrack = True
+
+    # Setting an empty memory dump config disables periodic dumps.
+    options.config.chrome_trace_config.SetMemoryDumpConfig(
+        chrome_trace_config.MemoryDumpConfig())
+
+    options.SetTimelineBasedMetrics(['powerMetric',
+                                     'cpuTimeMetric', 'memoryMetric'])
     return options
 
 
 # android: See media.android.tough_video_cases below
 @benchmark.Owner(emails=['johnchen@chromium.org', 'crouleau@chromium.org'],
                  component='Internals>Media')
 @benchmark.Disabled('android')
 class MediaToughVideoCasesTBMv2(_MediaTBMv2Benchmark):
   """Obtains media metrics using TBMv2.
   Will eventually replace MediaToughVideoCases class."""
@@ skipping 59 matching lines @@
 
   @classmethod
   def Name(cls):
     return 'media.mse_cases'
 
   def SetExtraBrowserOptions(self, options):
     # Needed to allow XHR requests to return stream objects.
     options.AppendExtraBrowserArgs(
         ['--enable-experimental-web-platform-features',
          '--ignore-autoplay-restrictions'])