WIP: Add support for additional flag-specified tracing categories.

telemetry/telemetry/benchmark_unittest.py

Index: telemetry/telemetry/benchmark_unittest.py
diff --git a/telemetry/telemetry/benchmark_unittest.py b/telemetry/telemetry/benchmark_unittest.py
index fe9ad8a1687e9bcac4fdb7b5dfb5ea71294a35f6..48401dcb926ede2a21b18abd811bfb2fb06c1117 100644
--- a/telemetry/telemetry/benchmark_unittest.py
+++ b/telemetry/telemetry/benchmark_unittest.py
@@ -90,12 +90,12 @@ class BenchmarkTest(unittest.TestCase):
     class OverrideBothBenchmark(benchmark.Benchmark):
       def CreatePageTest(self, _):
         return DummyPageTest()
-      def CreateTimelineBasedMeasurementOptions(self):
+      def CreateBaseTimelineBasedMeasurementOptions(self):
         return FakeTimelineBasedMeasurementOptions()
 
     assertion_regex = (
         'Cannot override both CreatePageTest and '
-        'CreateTimelineBasedMeasurementOptions')
+        'CreateBaseTimelineBasedMeasurementOptions')
     with self.assertRaisesRegexp(AssertionError, assertion_regex):
       OverrideBothBenchmark()
 
@@ -124,11 +124,11 @@ class BenchmarkTest(unittest.TestCase):
 
     class OverrideOptionsOnPageTestBenchmark(benchmark.Benchmark):
       test = DummyPageTest
-      def CreateTimelineBasedMeasurementOptions(self):
+      def CreateBaseTimelineBasedMeasurementOptions(self):
         return FakeTimelineBasedMeasurementOptions()
 
     assertion_regex = (
-        'Cannot override CreateTimelineBasedMeasurementOptions '
+        'Cannot override CreateBaseTimelineBasedMeasurementOptions '
         'with a PageTest')
     with self.assertRaisesRegexp(AssertionError, assertion_regex):
       OverrideOptionsOnPageTestBenchmark().CreatePageTest(options=None)