Revert of Updating the SwarmingIsolatedScriptTest to upload chartjson results to the

scripts/slave/upload_perf_dashboard_results.py

Index: scripts/slave/upload_perf_dashboard_results.py
diff --git a/scripts/slave/upload_perf_dashboard_results.py b/scripts/slave/upload_perf_dashboard_results.py
deleted file mode 100644
index 12d1c0e3a1e612eecb6a130e47f64248b865b845..0000000000000000000000000000000000000000
--- a/scripts/slave/upload_perf_dashboard_results.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2016 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 logging
-import json
-import optparse
-import os
-import re
-import sys
-
-from slave import results_dashboard
-from slave import slave_utils
-
-
-def _GetMainRevision(commit_pos, build_dir, revision=None):
-  """Return revision to use as the numerical x-value in the perf dashboard.
-
-  This will be used as the value of "rev" in the data passed to
-  results_dashboard.SendResults.
-
-  In order or priority, this function could return:
-    1. The value of "got_revision_cp" in build properties.
-    3. An SVN number, git commit position, or git commit hash.
-  """
-  if commit_pos is not None:
-    return int(re.search(r'{#(\d+)}', commit_pos).group(1))
-  # TODO(sullivan,qyearsley): Don't fall back to _GetRevision if it returns
-  # a git commit, since this should be a numerical revision. Instead, abort
-  # and fail.
-  return slave_utils.GetRevision(os.path.dirname(os.path.abspath(build_dir)))
-
-
-def main(args):
-  # Parse options
-  parser = optparse.OptionParser()
-  parser.add_option('--name')
-  parser.add_option('--chartjson-results')
-  parser.add_option('--got-revision-cp')
-  parser.add_option('--build-dir')
-  parser.add_option('--perf-id')
-  parser.add_option('--results-url')
-  parser.add_option('--buildername')
-  parser.add_option('--buildnumber')
-  parser.add_option('--got-webrtc-revision')
-  parser.add_option('--got-v8-revision')
-  parser.add_option('--version')
-  parser.add_option('--git-revision')
-  options, extra_args = parser.parse_args(args)
-
-  # Validate options.
-  if extra_args:
-    parser.error('Unexpected command line arguments')
-  if not options.perf_id or not options.results_url:
-    parser.error('--perf-id and --results-url are required')
-
-  main_revision = _GetMainRevision(options.got_revision_cp, options.build_dir)
-  blink_revision = slave_utils.GetBlinkRevision(options.build_dir)
-  revisions = slave_utils.GetPerfDashboardRevisionsWithProperties(
-    options.got_webrtc_revision, options.got_v8_revision, options.version,
-    options.git_revision, main_revision, blink_revision)
-  reference_build = 'reference' in options.name
-  stripped_test_name = options.name.replace('.reference', '')
-  dashboard_json = results_dashboard.MakeDashboardJsonV1(
-      json.loads(options.chartjson_results),
-      revisions, stripped_test_name, options.perf_id,
-      options.buildername, options.buildnumber,
-      None, reference_build)
-  if dashboard_json:
-    logging.debug(json.dumps(dashboard_json , indent=2))
-    results_dashboard.SendResults(
-      dashboard_json,
-      options.results_url,
-      options.build_dir)
-  else:
-    print 'Error: No perf dashboard JSON was produced.'
-    print '@@@STEP_FAILURE@@@'
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main((sys.argv)))