Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/skia/ios_flavor.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
 import default_flavor
 
 
 """iOS flavor utils, used for building for and running tests on iOS."""
 
 
 class iOSFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(iOSFlavorUtils, self).__init__(skia_api)
     self.default_env = {}
     if self._skia_api.running_in_swarming:
       self.default_env['XCODEBUILD'] = (
           self._skia_api.slave_dir.join('xcodebuild'))
-    self.ios_bin = self._skia_api.m.infra_paths['slave_build'].join(
+    self.ios_bin = self._skia_api.m.path['slave_build'].join(
         'skia', 'platform_tools', 'ios', 'bin')
 
   def step(self, name, cmd, **kwargs):
     args = [self.ios_bin.join('ios_run_skia')]
     env = {}
     env.update(kwargs.pop('env', {}))
     env.update(self.default_env)
     # Convert 'dm' and 'nanobench' from positional arguments
     # to flags, which is what iOSShell expects to select which
     # one is being run.
@@ skipping 130 matching lines @@
   def get_device_dirs(self):
     """ Set the directories which will be used by the build steps."""
     prefix = self.device_path_join('skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dir=prefix + 'skp/skps',
         tmp_dir=prefix + 'tmp_dir')