Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/ios/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.
 
 import copy
 
 from recipe_engine import recipe_api
 
 
 class iOSApi(recipe_api.RecipeApi):
@@ skipping 15 matching lines @@
         step_result.json.output['Xcode Version'],
         step_result.json.output['Xcode Build Version'],
       )
     return step_result
 
   def checkout(self, **kwargs):
     """Checks out Chromium."""
     kwargs.setdefault('force', True)
     self.m.gclient.set_config('ios')
     update_step = self.m.bot_update.ensure_checkout(**kwargs)
-    self.m.path['checkout'] = self.m.infra_paths['slave_build'].join('src')
+    self.m.path['checkout'] = self.m.path['slave_build'].join('src')
     return update_step
 
   @property
   def compiler(self):
     assert self.__config is not None
     return self.__config['compiler']
 
   @property
   def configuration(self):
     assert self.__config is not None
@@ skipping 308 matching lines @@
       *args: Any additional arguments to pass to the test harness.
     """
     assert self.__config is not None
     test_failures = []
     infrastructure_failures = []
 
     for test in self.__config['tests']:
       cmd = [
         self.package_repo_resource(
           'scripts', 'slave', 'ios', 'run.py'),
-        '--app', self.m.infra_paths['slave_build'].join(
+        '--app', self.m.path['slave_build'].join(
           self.most_recent_app_dir,
           '%s.app' % test['app'],
         ),
         '--json_file', self.m.json.output(),
       ]
 
       step_name = test['app']
 
       if self.platform == 'simulator':
         cmd.extend([
-          '--iossim', self.m.infra_paths['slave_build'].join(self.most_recent_iossim),
+          '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim),
           '--platform', test['device type'],
           '--version', test['os'],
         ])
 
         # Since we may be running simulator tests on multiple platforms,
         # include the platform and OS in the name of the step.
         step_name = '%s (%s iOS %s)' % (
           test['app'],
           test['device type'],
           test['os'],
@@ skipping 100 matching lines @@
         self.configuration,
         'iossim',
       ),
       'ninja': self.m.path.join(
         'src',
          build_dir,
          '%s-%s' % (self.configuration, platform),
          'iossim',
       ),
     }[self.compiler]