Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromite/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.
 
 import cgi
 import re
 
 from recipe_engine import recipe_api
 
 
@@ skipping 37 matching lines @@
   _MANIFEST_CMD_RE = re.compile(r'Automatic:\s+Start\s+([^\s]+)\s+([^\s]+)')
   _BUILD_ID_RE = re.compile(r'CrOS-Build-Id: (.+)')
 
   _cached_config = None
 
   @property
   def chromite_path(self):
     v = self.m.path.c.dynamic_paths.get('chromite')
     if v:
       return v
-    return self.m.infra_paths['slave_build'].join(self._chromite_subpath)
+    return self.m.path['slave_build'].join(self._chromite_subpath)
 
   def _set_chromite_path(self, path):
     self.m.path.c.dynamic_paths['chromite'] = path
 
   def get_config_defaults(self):
     defaults = {
         'CBB_CONFIG': self.m.properties.get('cbb_config'),
         'CBB_BRANCH': self.m.properties.get('cbb_branch'),
         'CBB_DEBUG': self.m.properties.get('cbb_debug') is not None,
         'CBB_CLOBBER': 'clobber' in self.m.properties,
@@ skipping 284 matching lines @@
     if self.c.cbb.build_id:
       cbb_args.extend(['--master-build-id', self.c.cbb.build_id])
 
     # Add custom args, if there are any.
     cbb_args.extend(args)
 
     # Run cbuildbot.
     return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),
                           self.c.cbb.config,
                           args=cbb_args,
-                          cwd=self.m.infra_paths['slave_build'])
+                          cwd=self.m.path['slave_build'])