Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/repo/api.py

 # Copyright 2013 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.
 
 """Common steps for recipes that use repo for source control."""
 
 import re
 
 from recipe_engine import recipe_api
 
 class RepoApi(recipe_api.RecipeApi):
   """Provides methods to encapsulate repo operations."""
 
   _REPO_LIST_RE = re.compile(r'^(.+) : (.+)$')
 
   # WARNING: The version of repo checked into depot_tools doesn't support
   # switching between branches correctly due to
   # https://code.google.com/p/git-repo/issues/detail?id=46
 
   def __init__(self, **kwargs):
     super(RepoApi, self).__init__(**kwargs)
     self._repo_path = None
 
   @property
   def repo_path(self):
     if not self._repo_path:
-      self._repo_path = self.m.infra_paths['depot_tools'].join('repo')
+      self._repo_path = self.m.path['depot_tools'].join('repo')
     return self._repo_path
 
   def __call__(self, args, name=None, **kwargs):
     """Executes 'repo' with the supplied arguments.
 
     Args:
       args: (list): A list of arguments to supply to 'repo'.
       name (str): The name of the step. If None, generate a name from the args.
       kwargs: Keyword arguments to pass to the 'step' call.
     Returns:
@@ skipping 43 matching lines @@
       match = self._REPO_LIST_RE.match(line)
       if match:
         result.append(match.groups())
 
     # Display the result in the step text.
     if result:
       step_result.presentation.step_text = '</br></br>'
       step_result.presentation.step_text += '</br>'.join(
           '%s : %s' % (path, name) for path, name in result)
     return result