Remove JsonOutputFormatter from telemetry.

telemetry/telemetry/internal/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 codecs
 import optparse
 import os
 import sys
 import time
 
 from py_utils import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import util
 from telemetry.internal.results import chart_json_output_formatter
 from telemetry.internal.results import csv_output_formatter
 from telemetry.internal.results import csv_pivot_table_output_formatter
 from telemetry.internal.results import gtest_progress_reporter
 from telemetry.internal.results import histogram_set_json_output_formatter
 from telemetry.internal.results import html_output_formatter
 from telemetry.internal.results import json_3_output_formatter
-from telemetry.internal.results import json_output_formatter
 from telemetry.internal.results import legacy_html_output_formatter
 from telemetry.internal.results import page_test_results
 from telemetry.internal.results import progress_reporter
 
 # Allowed output formats. The default is the first item in the list.
 
 _OUTPUT_FORMAT_CHOICES = (
     'chartjson',
     'csv',
     'csv-pivot-table',
     'gtest',
     'histograms',
     'html',
-    'json',
     'json-test-results',
     'legacy-html',
     'none',
     )
 
 
 # Filenames to use for given output formats.
 _OUTPUT_FILENAME_LOOKUP = {
     'chartjson': 'results-chart.json',
     'csv': 'results.csv',
     'csv-pivot-table': 'results-pivot-table.csv',
     'histograms': 'histograms.json',
     'html': 'results.html',
-    'json': 'results.json',
     'json-test-results': 'test-results.json',
     'legacy-html': 'legacy-results.html'
 }
 
 
 def AddResultsOptions(parser):
   group = optparse.OptionGroup(parser, 'Results options')
   group.add_option(
       '--output-format',
       action='append',
@@ skipping 105 matching lines @@
 
     output_stream = _GetOutputStream(output_format, options.output_dir)
     if output_format == 'csv-pivot-table':
       output_formatters.append(
           csv_pivot_table_output_formatter.CsvPivotTableOutputFormatter(
               output_stream, trace_tag=options.output_trace_tag))
     elif output_format == 'html':
       output_formatters.append(html_output_formatter.HtmlOutputFormatter(
           output_stream, benchmark_metadata, options.reset_results,
           upload_bucket))
-    elif output_format == 'json':
-      output_formatters.append(json_output_formatter.JsonOutputFormatter(
-          output_stream, benchmark_metadata))
     elif output_format == 'json-test-results':
       output_formatters.append(json_3_output_formatter.JsonOutputFormatter(
           output_stream))
     elif output_format == 'chartjson':
       output_formatters.append(
           chart_json_output_formatter.ChartJsonOutputFormatter(
               output_stream, benchmark_metadata))
     elif output_format == 'csv':
       output_formatters.append(
           csv_output_formatter.CsvOutputFormatter(
@@ skipping 25 matching lines @@
       output_dir=options.output_dir,
       value_can_be_added_predicate=value_can_be_added_predicate,
       benchmark_enabled=benchmark_enabled)
 
   results.telemetry_info.benchmark_name = benchmark_metadata.name
   results.telemetry_info.benchmark_start_epoch = time.time()
   if options.results_label:
     results.telemetry_info.label = options.results_label
 
   return results