Revert of Replace ValueSetOutputFormatter with HistogramSetJsonOutputFormatter.

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 46ecb1cc5f9b7646eaaeae30862e75aededf533e..319f4c2b5a0000f94f6593461d5343ee03e17210 100644
--- a/telemetry/telemetry/internal/results/results_options.py
+++ b/telemetry/telemetry/internal/results/results_options.py
@@ -3,8 +3,6 @@
 # found in the LICENSE file.
 
 import codecs
-import datetime
-import logging
 import optparse
 import os
 import sys
@@ -16,16 +14,16 @@
 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
-from telemetry.internal.results import histogram_set_json_output_formatter
 from telemetry.internal.results import html2_output_formatter
 from telemetry.internal.results import json_output_formatter
 from telemetry.internal.results import page_test_results
 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', 'gtest', 'json', 'chartjson',
-    'csv-pivot-table', 'histograms', 'none')
+    'csv-pivot-table', 'valueset', 'none')
 
 
 # Filenames to use for given output formats.
@@ -34,7 +32,7 @@
     'json': 'results.json',
     'chartjson': 'results-chart.json',
     'csv-pivot-table': 'results-pivot-table.csv',
-    'histograms': 'histograms.json',
+    'valueset': 'results-valueset.json'
 }
 
 
@@ -113,19 +111,6 @@
       sys.stdout, output_skipped_tests_summary=output_skipped_tests_summary)
 
 
-def _UploadResults(local_path, remote_prefix, bucket):
-  file_name = remote_prefix + datetime.datetime.now().strftime(
-      '%Y-%m-%d_%H-%M-%S')
-  try:
-    cloud_storage.Insert(bucket, file_name, os.path.abspath(local_path))
-    print 'View online at',
-    print 'http://storage.googleapis.com/{bucket}/{path}'.format(
-        bucket=bucket, path=file_name)
-  except cloud_storage.PermissionError as e:
-    logging.error('Cannot upload profiling files to cloud storage due to '
-                  ' permission error: %s' % e.message)
-
-
 def CreateResults(benchmark_metadata, options,
                   value_can_be_added_predicate=lambda v, is_first: True,
                   benchmark_enabled=True):
@@ -154,10 +139,8 @@
               output_stream, trace_tag=options.output_trace_tag))
     elif output_format == 'html':
       output_formatters.append(html2_output_formatter.Html2OutputFormatter(
-          output_stream, benchmark_metadata, options.reset_results))
-      if upload_bucket:
-        _UploadResults(output_stream.name, 'html-results/results-',
-            upload_bucket)
+          output_stream, benchmark_metadata, options.reset_results,
+          options.upload_results, upload_bucket=upload_bucket))
     elif output_format == 'json':
       output_formatters.append(json_output_formatter.JsonOutputFormatter(
           output_stream, benchmark_metadata))
@@ -165,13 +148,10 @@
       output_formatters.append(
           chart_json_output_formatter.ChartJsonOutputFormatter(
               output_stream, benchmark_metadata))
-    elif output_format == 'histograms':
+    elif output_format == 'valueset':
       output_formatters.append(
-          histogram_set_json_output_formatter.HistogramSetJsonOutputFormatter(
-              output_stream, benchmark_metadata, options.reset_results))
-      if upload_bucket:
-        _UploadResults(output_stream.name, 'json-results/results-',
-            upload_bucket)
+          valueset_output_formatter.ValueSetOutputFormatter(
+              output_stream))
     else:
       # Should never be reached. The parser enforces the choices.
       raise Exception('Invalid --output-format "%s". Valid choices are: %s'