Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/recreate_skps.py

 # Copyright 2014 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 for the Skia RecreateSKPs Bot."""
 
 
 from common.skia import global_constants
 
 
 DEPS = [
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
 ]
 
 
 from recipe_engine.recipe_api import Property
 
@@ skipping 21 matching lines @@
            ['build/gyp_chromium'],
            env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
                 'GYP_GENERATORS': 'ninja'},
            cwd=api.path['checkout'])
   # Build Chrome.
   api.step('Build Chrome',
            ['ninja', '-C', 'out/Release', 'chrome'],
            cwd=api.path['checkout'])
 
   # Capture the SKPs.
-  cmd = ['python', api.infra_paths['build'].join('scripts', 'slave', 'skia',
+  cmd = ['python', api.path['build'].join('scripts', 'slave', 'skia',
                                           'recreate_skps.py'),
          api.path['checkout'],
          api.path['checkout'].join('out', 'Release', 'chrome')]
   if 'Canary' in buildername:
     cmd.append('--dry-run')
   api.step('Recreate SKPs',
            cmd=cmd,
-           cwd=api.infra_paths['slave_build'].join('skia'),
+           cwd=api.path['slave_build'].join('skia'),
   )
 
 def GenTests(api):
   yield (
     api.test('RecreateSKPs') +
     api.properties(buildername='Housekeeper-Weekly-RecreateSKPs')
   )
   yield (
     api.test('RecreateSKPs_dryrun') +
     api.properties(buildername='Housekeeper-Nightly-RecreateSKPs_Canary')
   )