Add trace rerun options to benchmark and pass them through chartjson.

tools/telemetry/telemetry/web_perf/timeline_based_measurement.py

Index: tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
diff --git a/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py b/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
index 56ba9fcbb8cf171ad755181eeaa3b972019ac396..7a8f74d40fb5a85742371d6b5f5ed17fc3aad033 100644
--- a/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
+++ b/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
@@ -130,6 +130,10 @@ class Options(object):
         The v8 overhead level is a temporary solution that may be removed.
     """
     self._overhead_level = overhead_level
+    self._category_filters = []
+
+  def ExtendTraceCategoryFilters(self, filters):
+    self._category_filters.extend(filters)
 
 
 class TimelineBasedMeasurement(object):
@@ -156,6 +160,7 @@ class TimelineBasedMeasurement(object):
   """
   def __init__(self, options):
     self._overhead_level = options._overhead_level
+    self._category_filters = options._category_filters
 
   def WillRunUserStory(self, tracing_controller,
                        synthetic_delay_categories=None):
@@ -184,6 +189,9 @@ class TimelineBasedMeasurement(object):
     else:
       category_filter = tracing_category_filter.CreateDebugOverheadFilter()
 
+    for new_category_filter in self._category_filters:
+      category_filter.AddIncludedCategory(new_category_filter)
+
     # TODO(slamm): Move synthetic_delay_categories to the TBM options.
     for delay in synthetic_delay_categories or []:
       category_filter.AddSyntheticDelay(delay)