Pass in custom options to Systrace agents

systrace/profile_chrome/chrome_startup_tracing_agent.py

 # Copyright 2015 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.
 
+import optparse
 import os
 import py_utils
 import re
 
 from devil.android import flag_changer
 from devil.android.perf import cache_control
 from devil.android.sdk import intent
 
 from systrace import trace_result
 from systrace import tracing_agents
@@ skipping 34 matching lines @@
           package=self._package_info.package,
           activity=self._package_info.activity,
           data=self._url,
           extras={'create_new_tab': True})
     self._device.StartActivity(launch_intent, blocking=True)
 
   def _TearDownTracing(self):
     self._flag_changer.Restore()
 
   @py_utils.Timeout(tracing_agents.START_STOP_TIMEOUT)
-  def StartAgentTracing(self, options, categories, timeout=None):
+  def StartAgentTracing(self, config, timeout=None):
     self._SetupTracing()
     self._logcat_monitor.Start()
 
   @py_utils.Timeout(tracing_agents.START_STOP_TIMEOUT)
   def StopAgentTracing(self, timeout=None):
     try:
       self._trace_file = self._logcat_monitor.WaitFor(
           self._trace_finish_re).group(1)
     finally:
       self._TearDownTracing()
 
   @py_utils.Timeout(tracing_agents.GET_RESULTS_TIMEOUT)
   def GetResults(self, timeout=None):
     with open(self._PullTrace(), 'r') as f:
       trace_data = f.read()
     return trace_result.TraceResult('traceEvents', trace_data)
 
   def _PullTrace(self):
     trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/')
     host_file = os.path.join(os.path.curdir, os.path.basename(trace_file))
     self._device.PullFile(trace_file, host_file)
     return host_file
 
   def SupportsExplicitClockSync(self):
     return False
 
   def RecordClockSyncMarker(self, sync_id, did_record_sync_marker_callback):
     assert self.SupportsExplicitClockSync(), ('Clock sync marker cannot be '
         'recorded since explicit clock sync is not supported.')
+
+
+class ChromeStartupConfig(tracing_agents.TracingConfig):
+  def __init__(self):
+    tracing_agents.TracingConfig.__init__(self)
+
+
+def add_options(parser):
+  # The Chrome startup agent is not exposed to the user and thus has no
+  # command line options.

[Zhen Wang, 2016/08/27 15:32:41]

The comments need some revision. startup tracing's options are specified in
adb_profile_chrome_startup. Currently it does not support working with other
agents.

[washingtonp, 2016/08/29 06:40:02]

Done.

+  options = optparse.OptionGroup(parser, '')
+  return options
+
+def get_config(options):
+  # pylint: disable=unused-argument
+  return ChromeStartupConfig()