Revert "build: roll infra_paths changes"

scripts/slave/recipes/nacl.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.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
   'trigger',
 ]
 
 # Maps from triggering builder to triggered builder;
 # key builder triggers value builder.
@@ skipping 22 matching lines @@
   api.gclient.runhooks()
   return got_revision
 
 def _AnnotatedStepsSteps(api, got_revision):
   # Default environemnt; required by all builders.
   env = {
       'BUILDBOT_MASTERNAME': api.properties['mastername'],
       'BUILDBOT_BUILDERNAME': api.properties['buildername'],
       'BUILDBOT_REVISION': api.properties['revision'],
       'BUILDBOT_GOT_REVISION': got_revision,
-      'RUNTEST': api.infra_paths['build'].join('scripts', 'slave', 'runtest.py'),
+      'RUNTEST': api.path['build'].join('scripts', 'slave', 'runtest.py'),
       'BUILDBOT_SLAVE_TYPE': api.properties['slavetype'],
   }
   # Set up env for the triggered builders.
   if api.properties['buildername'] in trigger_map.values():
     env.update({
         'BUILDBOT_TRIGGERED_BY_BUILDERNAME':
           api.properties['parent_buildername'],
         'BUILDBOT_TRIGGERED_BY_BUILDNUMBER':
           api.properties['parent_buildnumber'],
         'BUILDBOT_TRIGGERED_BY_SLAVENAME':
@@ skipping 37 matching lines @@
       mastername = 'client.nacl',
       buildername = 'oneiric_32-newlib-arm_hw-pnacl-panda-dbg',
       revision = 'abcd',
       slavename='TestSlave',
       buildnumber = 5678,
       parent_slavename = 'TestSlave',
       parent_buildername = 'precise_64-newlib-arm_qemu-pnacl-dbg',
       parent_buildnumber = 1,
       slavetype = 'BuilderTester',
     ))