Revert of Update buildbots to parse new telemetry JSON format.

scripts/slave/telemetry.py

 #! /usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Set up and invoke telemetry tests."""
 
 import json
 import optparse
 import os
@@ skipping 59 matching lines @@
 
   test_specification = [test_name]
 
   env = os.environ
 
   # List of command line arguments common to all test platforms.
   common_args = [
       # INFO level verbosity.
       '-v',
       # Output results in the format the buildbot expects.
-      '--output-format=chartjson'
+      '--output-format=buildbot',
       ]
 
   if profile_type:
     profile_dir = os.path.join(
         build_dir, target, 'generated_profile', profile_type)
     common_args.append('--profile-dir=' + profile_dir)
   if extra_args:
     common_args.extend(extra_args)
 
   commands = []
@@ skipping 10 matching lines @@
                     '--']
   # If an executable is passed, use that instead.
   if browser_exe:
     browser_info = ['--browser=exact',
                     '--browser-executable=%s' % browser_exe]
   else:
     browser_info = ['--browser=%s' % browser]
   test_args = list(common_args)
   test_args.extend(browser_info)
   test_args.extend(test_specification)
-  test_args.extend(['--output=%s' % options.chart_output_filename])
   test_cmd = _GetPythonTestCommand(script, target, test_args,
                                    wrapper_args=wrapper_args, fp=fp)
   commands.append(test_cmd)
 
   # Run the test against the target chrome build for different user profiles on
   # certain page cyclers.
   if target_os != 'android':
     if test_name in ('page_cycler_moz', 'page_cycler_morejs'):
       test_args = list(common_args)
       test_args.extend(['--profile-type=typical_user',
@@ skipping 13 matching lines @@
 
   # Run the test against the reference build on platforms where it exists.
   ref_build = _GetReferenceBuildPath(target_os, target_platform)
   ref_build = fp.get('reference_build_executable', ref_build)
   if ref_build and fp.get('run_reference_build', True):
     ref_args = list(common_args)
     ref_args.extend(['--browser=exact',
                 '--browser-executable=%s' % ref_build,
                 '--output-trace-tag=_ref'])
     ref_args.extend(test_specification)
-    ref_args.extend(['--output=%s' % options.ref_output_filename])
     ref_cmd = _GetPythonTestCommand(script, target, ref_args, fp=fp)
     commands.append(ref_cmd)
 
   return commands, env
 
 
 def main(argv):
   prog_desc = 'Invoke telemetry performance tests.'
   parser = optparse.OptionParser(usage=('%prog [options]' + '\n\n' + prog_desc))
   parser.add_option('--print-cmd', action='store_true',
                     help='only print command instead of running it')
   parser.add_option('--target-android-browser',
                     default='android-chrome-shell',
                     help='target browser used on Android')
   parser.add_option('--factory-properties', action='callback',
                     callback=chromium_utils.convert_json, type='string',
                     nargs=1, default={},
                     help='factory properties in JSON format')
-  parser.add_option('--chart-output-filename',
-                    help='file to save telemetry test output')
-  parser.add_option('--ref-output-filename',
-                    help='file to save reference telemetry test output')
 
   options, _ = parser.parse_args(argv[1:])
   if not options.factory_properties:
     print 'This program requires a factory properties to run.'
     return 1
 
   commands, env = _GenerateTelemetryCommandSequence(options)
 
   retval = 0
   for command in commands:
     if options.print_cmd:
       print ' '.join("'%s'" % c for c in command)
       continue
 
     retval = chromium_utils.RunCommand(command, env=env)
     if retval != 0:
       break
   return retval
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))