Revert "build: roll infra_paths changes"

scripts/slave/recipes/dart/dartium_build.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 = [
   'chromium',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
 ]
 
 def RunSteps(api):
   config_vals = {}
   config_vals.update(
     dict((str(k), v) for k, v in api.properties.iteritems() if k.isupper())
@@ skipping 21 matching lines @@
   api.gclient.c.got_revision_mapping.pop('src', None)
   api.gclient.c.got_revision_mapping['src/dart'] = 'got_revision'
   if USE_MIRROR:
     s.custom_vars.update({
       'dartium_base': 'svn://svn-mirror.golo.chromium.org'})
 
   api.gclient.checkout()
 
   # gclient api incorrectly sets Path('[CHECKOUT]') to build/src/dartium.deps
   # because Dartium has its DEPS file in dartium.deps, not directly in src.
-  api.path['checkout'] = api.infra_paths['slave_build'].join('src')
+  api.path['checkout'] = api.path['slave_build'].join('src')
 
   api.chromium.runhooks()
   api.chromium.compile()
   api.python('archive_build',
-                   api.infra_paths['slave_build'].join(
+                   api.path['slave_build'].join(
                        'src', 'dart', 'tools', 'dartium', 'multivm_archive.py'),
                    [s.revision])
 
 
 def GenTests(api):
   for plat in ('win', 'mac', 'linux'):
     for bits in (64,):
       for use_mirror in (True, False):
         yield (
           api.test('basic_%s_%s_Mirror%s' % (plat, bits, use_mirror)) +
           api.properties.generic(
               TARGET_BITS=bits,
               USE_MIRROR=use_mirror,
               deps='dartium.deps',
               revision='12345') +
           api.platform(plat, bits)
       )