Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/ct_skps.py

 # 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.
 
 from common.skia import global_constants
 
 
 DEPS = [
   'ct',
   'file',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'gsutil',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/step',
   'recipe_engine/time',
   'skia',
   'skia_swarming',
   'swarming',
   'swarming_client',
   'depot_tools/tryserver',
@@ skipping 72 matching lines @@
 
   # Checkout Swarming scripts.
   # Explicitly set revision to empty string to checkout swarming ToT. If this is
   # not done then it crashes due to missing
   # api.properties['parent_got_swarming_client_revision'] which seems to be
   # set only for Chromium bots.
   api.swarming_client.checkout(revision='')
   # Ensure swarming_client is compatible with what recipes expect.
   api.swarming.check_client_version()
   # Setup Go isolate binary.
-  chromium_checkout = api.infra_paths['slave_build'].join('src')
+  chromium_checkout = api.path['slave_build'].join('src')
   api.skia_swarming.setup_go_isolate(chromium_checkout.join('tools', 'luci-go'))
 
   # Apply issue to the Skia checkout if this is a trybot run.
   api.tryserver.maybe_apply_issue()
 
   # Build the tool.
   api.step('build %s' % skia_tool,
            ['make', skia_tool, 'BUILDTYPE=%s' % configuration],
            cwd=api.path['checkout'])
 
   skps_chromium_build = api.properties.get(
       'skps_chromium_build', DEFAULT_SKPS_CHROMIUM_BUILD)
 
   # Set build property to make finding SKPs convenient.
   api.step.active_result.presentation.properties['Location of SKPs'] = (
       'https://pantheon.corp.google.com/storage/browser/%s/skps/%s/%s/' % (
           api.ct.CT_GS_BUCKET, ct_page_type, skps_chromium_build))
 
   # Delete swarming_temp_dir to ensure it starts from a clean slate.
   api.file.rmtree('swarming temp dir', api.skia_swarming.swarming_temp_dir)
 
   for slave_num in range(1, ct_num_slaves + 1):
     # Download SKPs.
     api.ct.download_skps(
         ct_page_type, slave_num, skps_chromium_build,
-        api.infra_paths['slave_build'].join('skps'))
+        api.path['slave_build'].join('skps'))
 
     # Create this slave's isolated.gen.json file to use for batcharchiving.
     isolate_dir = chromium_checkout.join('chrome')
     isolate_path = isolate_dir.join(CT_SKPS_ISOLATE)
     extra_variables = {
         'SLAVE_NUM': str(slave_num),
         'TOOL_NAME': skia_tool,
         'GIT_HASH': skia_hash,
         'CONFIGURATION': configuration,
     }
@@ skipping 69 matching lines @@
   )
 
   yield(
     api.test('CT_BENCH_10k_SKPs') +
     api.properties(
         buildername=
             'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     ) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('src')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('src')
     )
   )
 
   yield(
     api.test('CT_DM_1m_SKPs') +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     )
@@ skipping 46 matching lines @@
     api.test('CT_DM_10k_SKPs_Trybot') +
     api.properties(
         buildername=
             'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot',
         ct_num_slaves=ct_num_slaves,
         rietveld='codereview.chromium.org',
         issue=1499623002,
         patchset=1,
     )
   )