[tools/perf] Enable loading metrics for common system health benchmarks

tools/perf/benchmarks/loading.py

Index: tools/perf/benchmarks/loading.py
diff --git a/tools/perf/benchmarks/loading.py b/tools/perf/benchmarks/loading.py
index 04cb69d4a89c26df048d6e64c79db1f194d4d134..8c0f65158484a7e57aeb161738ab5f4cb1786b5a 100644
--- a/tools/perf/benchmarks/loading.py
+++ b/tools/perf/benchmarks/loading.py
@@ -10,6 +10,7 @@ from benchmarks import page_cycler_v2
 from telemetry import benchmark
 from telemetry.page import cache_temperature
 from telemetry.page import traffic_setting
+from telemetry.web_perf import timeline_based_measurement
 
 
 @benchmark.Enabled('android')
@@ -19,7 +20,9 @@ class LoadingMobile(perf_benchmark.PerfBenchmark):
   options = {'pageset_repeat': 2}
 
   def CreateTimelineBasedMeasurementOptions(self):
-    return page_cycler_v2.TimelineBasedMeasurementOptionsForLoadingMetric()
+    tbm_options = timeline_based_measurement.Options()
+    page_cycler_v2.AugmentOptionsForLoadingMetrics(tbm_options)
+    return tbm_options
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
@@ -53,7 +56,9 @@ class LoadingClusterTelemetry(perf_benchmark.PerfBenchmark):
   _ALL_NET_CONFIGS = traffic_setting.NETWORK_CONFIGS.keys()
 
   def CreateTimelineBasedMeasurementOptions(self):
-    return page_cycler_v2.TimelineBasedMeasurementOptionsForLoadingMetric()
+    tbm_options = timeline_based_measurement.Options()
+    page_cycler_v2.AugmentOptionsForLoadingMetrics(tbm_options)
+    return tbm_options
 
   @classmethod
   def Name(cls):