Pass in custom options to Systrace agents

systrace/bin/adb_profile_chrome_startup

 #!/usr/bin/env python
 #
 # 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 logging
 import optparse
 import os
 import sys
@@ skipping 15 matching lines @@
 from devil.android import device_utils
 
 
 def _CreateOptionParser():
   parser = optparse.OptionParser(description='Record about://tracing profiles '
                                  'from Android browsers startup, combined with '
                                  'Android systrace. See http://dev.chromium.org'
                                  '/developers/how-tos/trace-event-profiling-'
                                  'tool for detailed instructions for '
                                  'profiling.')
-  parser.add_option('--url', help='URL to visit on startup. Default: '
-                    'https://www.google.com. An empty URL launches Chrome with'
-                    ' a MAIN action instead of VIEW.',
-                    default='https://www.google.com', metavar='URL')
-  parser.add_option('--cold', help='Flush the OS page cache before starting the'
-                    ' browser. Note that this require a device with root '
-                    'access.', default=False, action='store_true')
-  parser.add_option_group(flags.AtraceOptions(parser))
-  parser.add_option_group(flags.OutputOptions(parser))
 
   browsers = sorted(profiler.GetSupportedBrowsers().keys())
   parser.add_option('-b', '--browser', help='Select among installed browsers. '
                     'One of ' + ', '.join(browsers) + ', "stable" is used by '
                     'default.', type='choice', choices=browsers,
                     default='stable')
   parser.add_option('-v', '--verbose', help='Verbose logging.',
                     action='store_true')
   parser.add_option('-z', '--compress', help='Compress the resulting trace '
                     'with gzip. ', action='store_true')
   parser.add_option('-t', '--time', help='Stops tracing after N seconds, 0 to '
                     'manually stop (startup trace ends after at most 5s).',
                     default=5, metavar='N', type='int')
+
+  parser.add_option_group(chrome_startup_tracing_agent.add_options(parser))
+  parser.add_option_group(atrace_tracing_agent.add_options(parser))
+  parser.add_option_group(flags.OutputOptions(parser))
+
   return parser
 
 
 def main():
   parser = _CreateOptionParser()
   options, _ = parser.parse_args()
 
   if options.verbose:
     logging.getLogger().setLevel(logging.DEBUG)
 
@@ skipping 14 matching lines @@
   # Enable the atrace and chrome agents. The atrace agent should go
   # first because otherwise the resulting traces miss early atrace data.
   if atrace_categories:
     enabled_agents.append(atrace_tracing_agent.AtraceAgent(
         device, atrace_categories, False))
   enabled_agents.append(
       chrome_startup_tracing_agent.ChromeStartupTracingAgent(
           device, package_info, options.cold, options.url))
   if options.output:
     options.output = os.path.expanduser(options.output)
-  result = profiler.CaptureProfile(enabled_agents,
+  result = profiler.CaptureProfile(options,
+                                   enabled_agents,
                                    options.time,
                                    output=options.output,
                                    compress=options.compress,
                                    write_json=options.json)
   if options.view:
     if sys.platform == 'darwin':
       os.system('/usr/bin/open %s' % os.path.abspath(result))
     else:
       webbrowser.open(result)
 
 
 if __name__ == '__main__':
   sys.exit(main())