Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/auto_bisect/api.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.
 
 """API for the bisect recipe module.
 
 This API is meant to enable the bisect recipe to bisect any chromium-supported
 platform for any test that can be run via buildbot, perf or otherwise.
 """
 
@@ skipping 144 matching lines @@
      self.surface_result('BAD_REV')
      raise
      
 
   def run_bisect_script(self, **kwargs):
     """Executes src/tools/run-perf-bisect-regression.py to perform bisection."""
     self.m.python(
         'Preparing for Bisection',
         script=self.m.path['checkout'].join(
             'tools', 'prepare-bisect-perf-regression.py'),
-        args=['-w', self.m.infra_paths['slave_build']])
+        args=['-w', self.m.path['slave_build']])
     args = []
 
     kwargs['allow_subannotations'] = True
 
     # TODO(prasadv): Remove this once bisect runs are no longer running
     # against revisions from February 2016 or earlier.
     if self.internal_bisect:  # pragma: no cover
       kwargs['env'] = {'CHROMIUM_OUTPUT_DIR': self.m.chromium.output_dir}
 
     if kwargs.get('extra_src'):
       args = args + ['--extra_src', kwargs.pop('extra_src')]
     if kwargs.get('path_to_config'):
       args = args + ['--path_to_config', kwargs.pop('path_to_config')]
     if self.m.chromium.c.TARGET_PLATFORM != 'android':
       # TODO(phajdan.jr): update for swarming, http://crbug.com/585401 .
-      args += ['--path_to_goma', self.m.infra_paths['build'].join('goma')]
+      args += ['--path_to_goma', self.m.path['build'].join('goma')]
     args += [
         '--build-properties',
         self.m.json.dumps(dict(self.m.properties.legacy())),
     ]
     self.m.chromium.runtest(
         self.m.path['checkout'].join('tools', 'run-bisect-perf-regression.py'),
-        ['-w', self.m.infra_paths['slave_build']] + args,
+        ['-w', self.m.path['slave_build']] + args,
         name='Running Bisection',
         xvfb=True, **kwargs)
 
   def run_local_test_run(self, test_config_params,
                          skip_download=False):  # pragma: no cover
     """Starts a test run on the same machine.
 
     This is for the merged director/tester flow.
     """
     if self.m.platform.is_win:
@@ skipping 175 matching lines @@
           local_bisect.perform_bisect(self)  # pragma: no cover
         else:
           self.start_test_run_for_bisect(update_step, self.bot_db,
                                          api.properties)
       else:
         self.m.perf_try.start_perf_try_job(
             affected_files, update_step, self.bot_db)
     finally:
       if api.chromium.c.TARGET_PLATFORM == 'android':
         api.chromium_android.common_tests_final_steps()