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 829c4789eaabda13c4a6147814b8a300c79dfb9b..58a0e4711621e5b21ca6c55c005599c300b76af0 100644 |
--- a/telemetry/telemetry/internal/results/results_options.py |
+++ b/telemetry/telemetry/internal/results/results_options.py |
@@ -18,7 +18,6 @@ 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 |
@@ -32,7 +31,6 @@ _OUTPUT_FORMAT_CHOICES = ( |
'gtest', |
'histograms', |
'html', |
- 'json', |
'json-test-results', |
'legacy-html', |
'none', |
@@ -46,7 +44,6 @@ _OUTPUT_FILENAME_LOOKUP = { |
'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' |
} |
@@ -172,9 +169,6 @@ def CreateResults(benchmark_metadata, options, |
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)) |