Revert of Update buildbots to parse new telemetry JSON format.

scripts/slave/unittests/telemetry_test.py

Index: scripts/slave/unittests/telemetry_test.py
diff --git a/scripts/slave/unittests/telemetry_test.py b/scripts/slave/unittests/telemetry_test.py
index 9b4676a2d044a26a70797f7b834f93acff1c4b5d..47facfab70b4e458d61528281c990b1f5b38c2e1 100755
--- a/scripts/slave/unittests/telemetry_test.py
+++ b/scripts/slave/unittests/telemetry_test.py
@@ -55,8 +55,7 @@
     fp = self._GetDefaultFactoryProperties()
 
     cmd = [self.telemetry, '--print-cmd',
-           '--factory-properties=%s' % json.dumps(fp),
-           '--chart-output-filename=name.out']
+           '--factory-properties=%s' % json.dumps(fp)]
 
     ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
     self.assertEqual(ret, 0)
@@ -78,9 +77,8 @@
             '\'--single-step\' ' +
             '\'--\' ' +
             '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=chartjson\' ' +
-            '\'--browser=android-chrome-shell\' \'sunspider\' ' +
-            '\'--output=name.out\''
+            '\'--output-format=buildbot\' ' +
+            '\'--browser=android-chrome-shell\' \'sunspider\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)
@@ -90,8 +88,7 @@
     fp['extra_args'] = ['--profile-dir=fake_dir']
 
     cmd = [self.telemetry, '--print-cmd',
-           '--factory-properties=%s' % json.dumps(fp),
-           '--chart-output-filename=tmpfile']
+           '--factory-properties=%s' % json.dumps(fp)]
 
     ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
     self.assertEqual(ret, 0)
@@ -114,10 +111,9 @@
             '\'--single-step\' ' +
             '\'--\' ' +
             '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=chartjson\' ' +
+            '\'--output-format=buildbot\' ' +
             '\'--profile-dir=fake_dir\' '+
-            '\'--browser=android-chrome-shell\' \'sunspider\' ' +
-            '\'--output=tmpfile\''
+            '\'--browser=android-chrome-shell\' \'sunspider\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)