Introduce OutputFormatter interface and wire it through PageTestResults.

tools/telemetry/telemetry/results/results_options.py

 # Copyright 2014 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.
 
 import optparse
 import os
 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 csv_page_measurement_results
+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 page_measurement_results
+from telemetry.results import page_test_results
 
 
 # Allowed output formats. The default is the first item in the list.
 _OUTPUT_FORMAT_CHOICES = ('html', 'buildbot', 'csv', 'gtest', 'none')
 
 
 def AddResultsOptions(parser):
   group = optparse.OptionGroup(parser, 'Results options')
   group.add_option('--output-format',
                     default=_OUTPUT_FORMAT_CHOICES[0],
@@ skipping 29 matching lines @@
     output_file = os.path.expanduser(options.output_file)
     open(output_file, 'a').close()  # Create file if it doesn't exist.
     output_stream = open(output_file, 'r+')
   else:
     output_stream = sys.stdout
   if not hasattr(options, 'output_format'):
     options.output_format = _OUTPUT_FORMAT_CHOICES[0]
   if not hasattr(options, 'output_trace_tag'):
     options.output_trace_tag = ''
 
+  output_formatters = []
   if options.output_format == 'none':
     return page_measurement_results.PageMeasurementResults(
         output_stream, trace_tag=options.output_trace_tag)
   elif options.output_format == 'csv':
-    return csv_page_measurement_results.CsvPageMeasurementResults(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)
   elif options.output_format == 'gtest':
     return gtest_test_results.GTestTestResults(output_stream)
   elif options.output_format == 'html':
     return html_page_measurement_results.HtmlPageMeasurementResults(
         output_stream, test.__class__.__name__, options.reset_results,
         options.upload_results, options.browser_type,
         options.results_label, trace_tag=options.output_trace_tag)
+
+  if len(output_formatters) > 0:
+    return page_test_results.PageTestResults(
+        output_formatters=output_formatters)
   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)))