telemetry: Remove command line args from page test

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 c399fcacd41564e25e0f621b91dc0a05f2f56b13..5b7c71b760fd2381106f3492d9bba1291aa1d6ef 100644
--- a/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
+++ b/tools/telemetry/telemetry/web_perf/timeline_based_measurement.py
@@ -137,35 +137,25 @@ class TimelineBasedMeasurement(page_test.PageTest):
   perf.metrics.timeline_interaction_record module.
 
   """
-  def __init__(self):
+  def __init__(self, overhead_level=NO_OVERHEAD_LEVEL, trace_dir=None):
     super(TimelineBasedMeasurement, self).__init__('RunSmoothness')
-
-  @classmethod
-  def AddCommandLineArgs(cls, parser):
-    parser.add_option(
-        '--overhead-level', dest='overhead_level', type='choice',
-        choices=ALL_OVERHEAD_LEVELS,
-        default=NO_OVERHEAD_LEVEL,
-        help='How much overhead to incur during the measurement.')
-    parser.add_option(
-        '--trace-dir', dest='trace_dir', type='string', default=None,
-        help=('Where to save the trace after the run. If this flag '
-              'is not set, the trace will not be saved.'))
+    self._overhead_level = overhead_level
+    self._trace_dir = trace_dir
 
   def WillNavigateToPage(self, page, tab):
     if not tab.browser.platform.tracing_controller.IsChromeTracingSupported(
         tab.browser):
       raise Exception('Not supported')
 
-    assert self.options.overhead_level in ALL_OVERHEAD_LEVELS
-    if self.options.overhead_level == NO_OVERHEAD_LEVEL:
+    assert self._overhead_level in ALL_OVERHEAD_LEVELS
+    if self._overhead_level == NO_OVERHEAD_LEVEL:
       category_filter = tracing_category_filter.CreateNoOverheadFilter()
     # TODO(ernstm): Remove this overhead level when benchmark relevant v8 events
     # become available in the 'benchmark' category.
-    elif self.options.overhead_level == V8_OVERHEAD_LEVEL:
+    elif self._overhead_level == V8_OVERHEAD_LEVEL:

[chrishenry, 2014/10/15 18:26:09]

Just to confirm: is there any plan to fold the necessary trace events from
V8_OVERHEAD_LEVEL to NO_OVERHEAD_LEVEL?

[ernstm, 2014/10/16 22:32:13]

Yes, this is waiting for Fadi's work to teach V8 about categories.

       category_filter = tracing_category_filter.CreateNoOverheadFilter()
       category_filter.AddIncludedCategory('v8')
-    elif self.options.overhead_level == MINIMAL_OVERHEAD_LEVEL:
+    elif self._overhead_level == MINIMAL_OVERHEAD_LEVEL:
       category_filter = tracing_category_filter.CreateMinimalOverheadFilter()
     else:
       category_filter = tracing_category_filter.CreateDebugOverheadFilter()
@@ -179,7 +169,7 @@ class TimelineBasedMeasurement(page_test.PageTest):
   def ValidateAndMeasurePage(self, page, tab, results):
     """ Collect all possible metrics and added them to results. """
     trace_result = tab.browser.platform.tracing_controller.Stop()
-    trace_dir = self.options.trace_dir
+    trace_dir = self._trace_dir
     if trace_dir:
       trace_file_path = util.GetSequentialFileName(
           os.path.join(trace_dir, 'trace')) + '.json'