Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromium_tests/steps.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.
 
 import re
 import string
 
 
 class Test(object):
   """
@@ skipping 562 matching lines @@
 
     tests['steps'] = {k: v for k, v in tests['steps'].iteritems()
         if v['device_affinity'] / self._num_device_shards == self._shard_index}
     for test_info in tests['steps'].itervalues():
       test_info['device_affinity'] %= self._num_device_shards
 
     return tests
 
   def _run_sharded(self, api, tests):
     known_devices_file = (
-        api.infra_paths['build'].join(
+        api.path['build'].join(
             'site_config', self._known_devices_file) if self._known_devices_file
         else None)
     api.chromium_android.run_sharded_perf_tests(
       config=api.json.input(data=tests),
       perf_id=self._perf_id,
       chartjson_file=True,
       max_battery_temp=self._max_battery_temp,
       known_devices_file=known_devices_file)
 
   def _run_serially(self, api, tests):
@@ skipping 1077 matching lines @@
 
   @staticmethod
   def compile_targets(api):
     return ['blink_tests']
 
   @property
   def uses_local_devices(self):
     return True
 
   def run(self, api, suffix, test_filter=None):
-    results_dir = api.infra_paths['slave_build'].join('layout-test-results')
+    results_dir = api.path['slave_build'].join('layout-test-results')
 
     step_name = self._step_name(suffix)
     args = [
         '--target', api.chromium.c.BUILD_CONFIG,
         '-o', results_dir,
         '--build-dir', api.chromium.c.build_dir,
         '--json-test-results', api.test_utils.test_results(add_json_log=False),
         '--test-results-server', 'test-results.appspot.com',
         '--build-number', str(api.properties['buildnumber']),
         '--builder-name', api.properties['buildername'],
         '--step-name', step_name,
     ]
     if api.chromium.c.TARGET_PLATFORM == 'android':
       args.extend(['--platform', 'android'])
     if self._extra_args:
       args.extend(self._extra_args)
     if suffix == 'without patch':
       test_list = "\n".join(self.failures(api, 'with patch'))
       args.extend(['--test-list', api.raw_io.input(test_list),
                    '--skipped', 'always'])
 
     try:
       step_result = api.chromium.runtest(
-          api.infra_paths['build'].join('scripts', 'slave', 'chromium',
+          api.path['build'].join('scripts', 'slave', 'chromium',
                                  'layout_test_wrapper.py'),
           args, name=step_name,
           # TODO(phajdan.jr): Clean up the runtest.py mess.
           disable_src_side_runtest_py=True,
           step_test_data=lambda: api.test_utils.test_api.canned_test_output(
               passing=True, minimal=True))
 
       # Mark steps with unexpected flakes as warnings. Do this here instead of
       # "finally" blocks because we only want to do this if step was successful.
       # We don't want to possibly change failing steps to warnings.
@@ skipping 11 matching lines @@
           p.step_text += api.test_utils.format_step_text([
             ['unexpected_flakes:', r.unexpected_flakes.keys()],
             ['unexpected_failures:', r.unexpected_failures.keys()],
             ['Total executed: %s' % r.num_passes],
           ])
 
       if suffix in ('', 'with patch'):
         buildername = api.properties['buildername']
         buildnumber = api.properties['buildnumber']
 
-        archive_layout_test_results = api.infra_paths['build'].join(
+        archive_layout_test_results = api.path['build'].join(
             'scripts', 'slave', 'chromium', 'archive_layout_test_results.py')
 
         archive_layout_test_args = [
           '--results-dir', results_dir,
           '--build-dir', api.chromium.c.build_dir,
           '--build-number', buildnumber,
           '--builder-name', buildername,
           '--gs-bucket', 'gs://chromium-layout-test-archives',
         ]
         # TODO(phajdan.jr): Pass gs_acl as a parameter, not build property.
@@ skipping 102 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]