Skia recipe: Use [depot_tools]/gsutil.py instead of [depot_tools]/third_party/gsutil/gsutil

scripts/slave/recipes/skia/swarm_trigger.py

 # 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.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import json
 
@@ skipping 439 matching lines @@
     api.file.rmtree('perf_dir', perf_data_dir, infra_step=True)
     api.file.makedirs('perf_dir', perf_data_dir, infra_step=True)
     src_results_file = task.task_output_dir.join(
         '0', 'perfdata', api.properties['buildername'], 'data',
         'nanobench_%s.json' % got_revision)
     dst_results_file = perf_data_dir.join(
         'nanobench_%s_%s.json' % (got_revision, git_timestamp))
     api.file.copy('perf_results', src_results_file, dst_results_file,
                   infra_step=True)
 
-    gsutil_path = api.path['depot_tools'].join(
-        'third_party', 'gsutil', 'gsutil')
+    gsutil_path = api.path['depot_tools'].join('gsutil.py')
     upload_args = [api.properties['buildername'], api.properties['buildnumber'],
                    perf_data_dir, got_revision, gsutil_path]
     if is_trybot:
       upload_args.append(api.properties['issue'])
     api.python(
              'Upload perf results',
              script=api.skia.resource('upload_bench_results.py'),
              args=upload_args,
              cwd=api.path['checkout'],
              env=api.skia.gsutil_env('chromium-skia-gm.boto'),
@@ skipping 86 matching lines @@
   # into the nanobench_${git_hash}_${timestamp}.json file
   # upload_bench_results.py expects.
   src_nano_file = results_dir.join('nanobench_%s.json' % got_revision)
   dst_nano_file = results_dir.join(
       'nanobench_%s_%s.json' % (got_revision, git_timestamp))
   api.file.copy('nanobench JSON', src_nano_file, dst_nano_file,
                 infra_step=True)
   api.file.remove('old nanobench JSON', src_nano_file)
 
   # Upload nanobench JSON data.
-  gsutil_path = api.path['depot_tools'].join(
-      'third_party', 'gsutil', 'gsutil')
+  gsutil_path = api.path['depot_tools'].join('gsutil.py')
   upload_args = [api.properties['buildername'], api.properties['buildnumber'],
                  results_dir, got_revision, gsutil_path]
   if is_trybot:
     upload_args.append(api.properties['issue'])
   api.python(
       'upload nanobench coverage results',
       script=api.skia.resource('upload_bench_results.py'),
       args=upload_args,
       cwd=api.path['checkout'],
       env=api.skia.gsutil_env('chromium-skia-gm.boto'),
@@ skipping 311 matching lines @@
                    mastername=master,
                    slavename=slave,
                    buildnumber=5,
                    path_config='kitchen',
                    revision='abc123',
                    **gerrit_kwargs) +
     api.step_data('upload new .isolated file for compile_skia',
                   stdout=api.raw_io.output('def456 XYZ.isolated'))
   )
   yield test