Reland of [Telemetry] Remove BuildbotOutputFormatter

telemetry/telemetry/internal/results/results_options.py

Index: telemetry/telemetry/internal/results/results_options.py
diff --git a/telemetry/telemetry/internal/results/results_options.py b/telemetry/telemetry/internal/results/results_options.py
index 715a21326f5ad000913ab338bd508852846b8e48..a1c0bb7cc8d6ad1809d50ecfab39f77bfdbc8534 100644
--- a/telemetry/telemetry/internal/results/results_options.py
+++ b/telemetry/telemetry/internal/results/results_options.py
@@ -11,7 +11,6 @@ import time
 from catapult_base import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import util
-from telemetry.internal.results import buildbot_output_formatter
 from telemetry.internal.results import chart_json_output_formatter
 from telemetry.internal.results import csv_pivot_table_output_formatter
 from telemetry.internal.results import gtest_progress_reporter
@@ -23,7 +22,8 @@ from telemetry.internal.results import progress_reporter
 from telemetry.internal.results import valueset_output_formatter
 
 # Allowed output formats. The default is the first item in the list.
-_OUTPUT_FORMAT_CHOICES = ('html', 'html2', 'buildbot', 'gtest', 'json',
+
+_OUTPUT_FORMAT_CHOICES = ('html', 'html2', 'gtest', 'json',
     'chartjson', 'csv-pivot-table', 'valueset', 'none')
 
 
@@ -53,7 +53,7 @@ def AddResultsOptions(parser):
   group.add_option('--output-trace-tag',
                     default='',
                     help='Append a tag to the key of each result trace. Use '
-                    'with html, buildbot, csv-pivot-table output formats.')
+                    'with html, csv-pivot-table output formats.')
   group.add_option('--reset-results', action='store_true',
                     help='Delete all stored results.')
   group.add_option('--upload-results', action='store_true',
@@ -93,9 +93,6 @@ def _GetOutputStream(output_format, output_dir):
   assert output_format not in ('gtest', 'none'), (
       'Cannot set stream for \'gtest\' or \'none\' output formats.')
 
-  if output_format == 'buildbot':
-    return sys.stdout
-
   assert output_format in _OUTPUT_FILENAME_LOOKUP, (
       'No known filename for the \'%s\' output format' % output_format)
   output_file = os.path.join(output_dir, _OUTPUT_FILENAME_LOOKUP[output_format])
@@ -135,19 +132,7 @@ def CreateResults(benchmark_metadata, options,
       output_formatters.append(
           csv_pivot_table_output_formatter.CsvPivotTableOutputFormatter(
               output_stream, trace_tag=options.output_trace_tag))
-    elif output_format == 'buildbot':
-      output_formatters.append(
-          buildbot_output_formatter.BuildbotOutputFormatter(
-              output_stream, trace_tag=options.output_trace_tag))
     elif output_format == 'html':
-      # TODO(chrishenry): We show buildbot output so that users can grep
-      # through the results easily without needing to open the html
-      # file.  Another option for this is to output the results directly
-      # in gtest-style results (via some sort of progress reporter),
-      # as we plan to enable gtest-style output for all output formatters.
-      output_formatters.append(
-          buildbot_output_formatter.BuildbotOutputFormatter(
-              sys.stdout, trace_tag=options.output_trace_tag))
       output_formatters.append(html_output_formatter.HtmlOutputFormatter(
           output_stream, benchmark_metadata, options.reset_results,
           options.upload_results, options.browser_type,