Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/cipd_test.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.
 """An end-to-end test for recipe module `cipd`.
 
 This actually installs cipd client and runs commands against it through cipd
 recipe module. The test is end-to-end, which means that if cipd App Engine app
 is down, this will fail.
 """
 
 DEPS = [
   'depot_tools/bot_update',
   'cipd',
   'file',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
   'depot_tools/tryserver'
 ]
 
@@ skipping 43 matching lines @@
       allow_subannotations=True,
   )
 
 
 def inner(api):
   """Actually performs the test in existing checkout."""
   api.cipd.install_client()
   assert api.cipd.get_executable()
 
   test_package = '%s/%s' % (TEST_PACKAGE_PREFIX, api.cipd.platform_suffix())
-  test_package_file = api.infra_paths['slave_build'].join('test_package.cipd')
+  test_package_file = api.path['slave_build'].join('test_package.cipd')
   step = api.cipd.build(api.properties['dir_to_package'],
                         test_package_file,
                         test_package, install_mode='copy')
   package_pin = step.json.output['result']
   instance_id = package_pin['instance_id']
   assert package_pin['package'] == test_package
   step.presentation.step_text = 'instance_id: %s' % package_pin['instance_id']
 
   # Path to a service account credentials to use to talk to CIPD backend.
   # Deployed by Puppet.
@@ skipping 35 matching lines @@
   )
 
   # Verify that tags are properly set. Note, there could be more tags!
   unset_tags = set('%s:%s' % i for i in tags.iteritems())
   for tag_info in step.json.output['result']['tags']:
     if tag_info['tag'] in unset_tags:
       unset_tags.remove(tag_info['tag'])
   assert not unset_tags
 
   # Install test package we've just uploaded by ref.
-  cipd_root = api.infra_paths['slave_build'].join('cipd_test_package')
+  cipd_root = api.path['slave_build'].join('cipd_test_package')
   api.cipd.ensure(cipd_root, {test_package: 'latest'})
   # Someone might have changed the latest ref in the meantime,
   # so install again by exact instance_id.
   step = api.cipd.ensure(cipd_root,
                          {test_package: package_pin['instance_id']})
   assert step.json.output['result'][0] == package_pin, (
       '\n%s\n!=\n%s\n' % (step.json.output['result'][0], package_pin))
 
   # Verify that we got same data back by building a new package from the
   # installation folder and compare hashes.
@@ skipping 38 matching lines @@
       )
   )
   yield (
       api.test('cipd-latest-ok-outer-patch-rietveld') +
       api.properties.tryserver(
           mastername='chromium.infra',
           buildername='cipd-module-tester',
           patch_project='build',
       )
   )