Revert of Update buildbots to parse new telemetry JSON format.

scripts/slave/telemetry.py

Index: scripts/slave/telemetry.py
diff --git a/scripts/slave/telemetry.py b/scripts/slave/telemetry.py
index dca09ee80c2ace3a7e76ee5ab30d1f7a18bcc0c4..b486d378517f086603caa44c7a816047ed877f9b 100755
--- a/scripts/slave/telemetry.py
+++ b/scripts/slave/telemetry.py
@@ -77,7 +77,7 @@
       # INFO level verbosity.
       '-v',
       # Output results in the format the buildbot expects.
-      '--output-format=chartjson'
+      '--output-format=buildbot',
       ]
 
   if profile_type:
@@ -108,7 +108,6 @@
   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)
@@ -142,7 +141,6 @@
                 '--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)
 
@@ -161,10 +159,6 @@
                     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: