Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/auto_bisect/bisector.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.
 
 import json
 import re
 import time
 import urllib
 
 from . import config_validation
@@ skipping 327 matching lines @@
         r'(?<=["\']%s["\']: ["\'])([a-fA-F0-9]+)(?=["\'])' % deps_var,
         re.MULTILINE)
     if not re.search(deps_item_regexp, original_contents):  # pragma: no cover
       reason = 'DEPS file does not contain entry for ' + deps_var
       self.api.m.halt(reason)
       raise self.api.m.step.StepFailure(reason)
 
     patched_contents = re.sub(deps_item_regexp, new_commit_hash,
                               original_contents)
 
-    cwd = self.api.m.infra_paths['slave_build'].join(
+    cwd = self.api.m.path['slave_build'].join(
         depot_config.DEPOT_DEPS_NAME[base_revision.depot_name]['src'])
     deps_file = 'DEPS'
     # This is to support backward compatibility on android-chrome because
     # .DEPS.git got migrated to DEPS on April 5, 2016
     if (base_revision.depot_name == 'android-chrome' and
         self.api.m.path.exists(self.api.m.path.join(cwd, '.DEPS.git'))):
       deps_file = '.DEPS.git'  # pragma: no cover
 
     interned_deps_hash = self._git_intern_file(
         patched_contents, cwd, new_commit_hash)
@@ skipping 581 matching lines @@
         })
     return revision_rows
 
   def _get_build_url(self):
     properties = self.api.m.properties
     bot_url = properties.get('buildbotURL',
                              'http://build.chromium.org/p/chromium/')
     builder_name = urllib.quote(properties.get('buildername', ''))
     builder_number = str(properties.get('buildnumber', ''))
     return '%sbuilders/%s/builds/%s' % (bot_url, builder_name, builder_number)