Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/infra.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.
 
 
 # Recipe for Skia Infra.
 
 
 import re
 
 
 DEPS = [
-  'depot_tools/infra_paths',
   'file',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'depot_tools/rietveld',
   'recipe_engine/step',
 ]
 
@@ skipping 32 matching lines @@
   api.path['checkout'] = dest
 
   # Maybe apply a patch.
   if (api.properties.get('rietveld') and
       api.properties.get('issue') and
       api.properties.get('patchset')):
     api.rietveld.apply_issue()
 
 
 def RunSteps(api):
-  go_dir = api.infra_paths['slave_build'].join('go')
+  go_dir = api.path['slave_build'].join('go')
   go_src = go_dir.join('src')
   api.file.makedirs('makedirs go/src', go_src)
   infra_dir = go_src.join(INFRA_GO)
 
   # Check out the infra repo.
   git_checkout(
       api,
       INFRA_GIT_URL,
       dest=infra_dir,
       ref=api.properties.get('revision', 'origin/master'))
@@ skipping 42 matching lines @@
   karma_port = '9876'
   if m and len(m.groups()) > 0:
     karma_port = '15%s' % m.groups()[0]
   env['KARMA_PORT'] = karma_port
   api.python('run_unittests', 'run_unittests', cwd=infra_dir, env=env)
 
 
 def GenTests(api):
   yield (
       api.test('Infra-PerCommit') +
-      api.infra_paths.exists(
-          api.infra_paths['slave_build'].join('go', 'src', INFRA_GO, '.git')) +
+      api.path.exists(api.path['slave_build'].join('go', 'src', INFRA_GO,
+                                                   '.git')) +
       api.properties(slavename='skiabot-linux-infra-001')
   )
   yield (
       api.test('Infra-PerCommit_initialcheckout') +
       api.properties(slavename='skiabot-linux-infra-001')
   )
   yield (
       api.test('Infra-PerCommit_try') +
       api.properties(rietveld='https://codereview.chromium.org',
                      issue=1234,
                      patchset=1,
                      revision=REF_HEAD,
                      slavename='skiabot-linux-infra-001')
   )