Add a module for tracking categories that metrics depend on.

tools/perf/benchmarks/page_cycler_v2.py

 # Copyright 2016 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.
 
 """The page cycler v2.
 
 For details, see design doc:
 https://docs.google.com/document/d/1EZQX-x3eEphXupiX-Hq7T4Afju5_sIdxPWYetj7ynd0
 """
 
 from core import perf_benchmark
 import page_sets
 
+from benchmarks import metric_dependencies
 from telemetry import benchmark
 from telemetry.page import cache_temperature
 from telemetry.web_perf import timeline_based_measurement
 
 
-def AugmentOptionsForLoadingMetrics(tbm_options):
-  cat_filter = tbm_options.config.chrome_trace_config.category_filter
-
-  # "blink.console" is used for marking ranges in
-  # cache_temperature.MarkTelemetryInternal.
-  cat_filter.AddIncludedCategory('blink.console')
-
-  # "navigation" and "blink.user_timing" are needed to capture core
-  # navigation events.
-  cat_filter.AddIncludedCategory('navigation')
-  cat_filter.AddIncludedCategory('blink.user_timing')
-
-  # "loading" is needed for first-meaningful-paint computation.
-  cat_filter.AddIncludedCategory('loading')
-
-  # "toplevel" category is used to capture TaskQueueManager events
-  # necessary to compute time-to-interactive.
-  cat_filter.AddIncludedCategory('toplevel')
-
-  tbm_options.AddTimelineBasedMetric('loadingMetric')
-  return tbm_options
-
-
 class _PageCyclerV2(perf_benchmark.PerfBenchmark):
   options = {'pageset_repeat': 2}
 
   def CreateTimelineBasedMeasurementOptions(self):
     tbm_options = timeline_based_measurement.Options()
-    AugmentOptionsForLoadingMetrics(tbm_options)
+    tbm_options.SetTimelineBasedMetrics(['loadingMetric'])
+    metric_dependencies.AugmentOptionsForMetrics(tbm_options, ['loadingMetric'])
     return tbm_options
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # crbug.com/619254
     if possible_browser.browser_type == 'reference':
       return True
 
     # crbug.com/616781
     if (cls.IsSvelte(possible_browser) or
@@ skipping 158 matching lines @@
   set, without running in out-of-process iframes mode.. """
   page_set = page_sets.OopifBasicPageSet
 
   @classmethod
   def Name(cls):
     return 'page_cycler_v2.basic_oopif'
 
   def CreateStorySet(self, options):
     return page_sets.OopifBasicPageSet(cache_temperatures=[
           cache_temperature.PCV1_COLD, cache_temperature.PCV1_WARM])