Move Html and BuildbotPageMeasurementResults to {Html,Buildbot}OutputFormatter.

tools/telemetry/telemetry/results/results_options.py

Index: tools/telemetry/telemetry/results/results_options.py
diff --git a/tools/telemetry/telemetry/results/results_options.py b/tools/telemetry/telemetry/results/results_options.py
index 2607d42d07d797a78c292f47e8768b85ce598a10..c3bee7d1596e0a3bca598fbca660ce9e80f84336 100644
--- a/tools/telemetry/telemetry/results/results_options.py
+++ b/tools/telemetry/telemetry/results/results_options.py
@@ -8,12 +8,11 @@ import sys
 
 from telemetry.core import util
 from telemetry.page import page_measurement
-from telemetry.results import buildbot_page_measurement_results
+from telemetry.results import buildbot_output_formatter
 from telemetry.results import csv_output_formatter
 from telemetry.results import gtest_test_results
-from telemetry.results import html_page_measurement_results
+from telemetry.results import html_output_formatter
 from telemetry.results import json_output_formatter
-from telemetry.results import page_measurement_results
 from telemetry.results import page_test_results
 
 
@@ -51,6 +50,9 @@ def PrepareResults(test, options):
     if options.output_format != 'none':
       options.output_format = 'gtest'
 
+  # TODO(chrishenry): This logic prevents us from having multiple
+  # OutputFormatters. We should have an output_file per OutputFormatter.
+  # Maybe we should have --output-dir instead of --output-file?

[nednguyen, 2014/07/30 00:02:54]

how about --output-format be able to take in a comma-delimited of format choice?

Then we can output: results.html, results.json, results.csv. 

The other two gtest & buildbot are streaming to stdout for now.

Default options is probably "html,buildbot".

[chrishenry, 2014/07/30 00:37:20]

Yeah, that's a good alternative. Was thinking of --output-dir since we also want
to output other files in the future (trace, etc), so specifying a single
--output-dir may be better.
I think the fact that html also output buildbot format is accidental. So let's
not expose that. I think I want to make progress reporter reports the values and
remove BuildbotOF from the "html" code path.

   if options.output_format == 'html' and not options.output_file:
     options.output_file = os.path.join(util.GetBaseDir(), 'results.html')
 
@@ -67,29 +69,34 @@ def PrepareResults(test, options):
 
   output_formatters = []
   if options.output_format == 'none':
-    return page_measurement_results.PageMeasurementResults(
-        output_stream, trace_tag=options.output_trace_tag)
+    pass
   elif options.output_format == 'csv':
-    output_formatters.append(
-        csv_output_formatter.CsvOutputFormatter(output_stream))
+    output_formatters.append(csv_output_formatter.CsvOutputFormatter(
+        output_stream))
   elif options.output_format == 'buildbot':
-    return buildbot_page_measurement_results.BuildbotPageMeasurementResults(
-        output_stream, trace_tag=options.output_trace_tag)
+    output_formatters.append(buildbot_output_formatter.BuildbotOutputFormatter(
+        output_stream, trace_tag=options.output_trace_tag))
   elif options.output_format == 'gtest':
     return gtest_test_results.GTestTestResults(output_stream)
   elif options.output_format == 'html':
-    return html_page_measurement_results.HtmlPageMeasurementResults(
+    # 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, test.__class__.__name__, options.reset_results,
         options.upload_results, options.browser_type,
-        options.results_label, trace_tag=options.output_trace_tag)
+        options.results_label, trace_tag=options.output_trace_tag))
   elif options.output_format == 'json':
-    return json_output_formatter.JsonOutputFormatter(output_stream)
-
-  if len(output_formatters) > 0:
-    return page_test_results.PageTestResults(
-        output_formatters=output_formatters)
+    output_formatters.append(json_output_formatter.JsonOutputFormatter(
+        output_stream))
   else:
     # Should never be reached. The parser enforces the choices.
     raise Exception('Invalid --output-format "%s". Valid choices are: %s'
                     % (options.output_format,
                        ', '.join(_OUTPUT_FORMAT_CHOICES)))
+
+  return page_test_results.PageTestResults(output_formatters=output_formatters)