Improve the command line interface for perf dashboard upload.

mojo/tools/perf_test_runner.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """A tool that runs a perf test and uploads the resulting data to the
 performance dashboard.
 
 By default uploads to a local testing dashboard assumed to be running on the
 host. To run such server, check out Catapult and follow instructions at
@@ skipping 70 matching lines @@
 
   perf_dashboard.add_argparse_server_arguments(parser)
   parser.add_argument(
       "--perf-data-path",
       help="The path to the perf data that the perf test generates.")
   parser.add_argument("command", nargs=argparse.REMAINDER)
   args = parser.parse_args()
 
   subprocess.check_call(args.command)
 
+  if not args.upload:
+    return 0
+
   if args.master_name is None or \
-     args.perf_id is None or \
+     args.bot_name is None or \
      args.test_name is None or \
      args.builder_name is None or \
      args.build_number is None or \
      args.perf_data_path is None:
-    print "Won't upload perf data to the dashboard because not all of the " \
+    print "Can't upload perf data to the dashboard because not all of the " \
           "following values are specified: master-name, perf-id, test-name, " \
           "builder-name, build-number, perf-data-path."
-    return 0
+    return 1
 
   revision = Version().version
   point_id = _GetCurrentCommitCount()
   with open(args.perf_data_path, "r") as perf_data:
     chart_data = _ConvertPerfDataToChartFormat(perf_data, args.test_name)
 
   result = perf_dashboard.upload_chart_data(
-      args.master_name, args.perf_id, args.test_name, args.builder_name,
+      args.master_name, args.bot_name, args.test_name, args.builder_name,
       args.build_number, revision, chart_data, point_id, args.server_url,
       args.dry_run)
 
   return 0 if result else 1
 
 
 if __name__ == '__main__':
   sys.exit(main())