Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromium/api.py

Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index cc774a24d381aa51c33b209459f1438a4d2f690b..c65b91262c05115d45ee7f95a6ec720b4427f57d 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -50,8 +50,6 @@ class ChromiumApi(recipe_api.RecipeApi):
         else self.m.platform.bits),
 
       'BUILD_CONFIG': self.m.properties.get('build_config', 'Release'),
-
-      'BUILD_PATH': self.m.infra_paths['build'],
     }
 
   def get_env(self):
@@ -164,7 +162,7 @@ class ChromiumApi(recipe_api.RecipeApi):
       '--ninja-path', self.m.depot_tools.ninja_path,
       '--target', target or self.c.build_config_fs,
       '--src-dir', self.m.path['checkout'],
-      '--goma-cache-dir', self.m.infra_paths['goma_cache'],
+      '--goma-cache-dir', self.m.path['goma_cache'],
     ]
     if self.c.compile_py.build_args:
       args += ['--build-args', self.c.compile_py.build_args]
@@ -531,7 +529,7 @@ class ChromiumApi(recipe_api.RecipeApi):
 
     self.m.python(
         name='gn',
-        script=self.m.infra_paths['depot_tools'].join('gn.py'),
+        script=self.m.path['depot_tools'].join('gn.py'),
         args=[
             '--root=%s' % str(self.m.path['checkout']),
             'gen',
@@ -566,7 +564,7 @@ class ChromiumApi(recipe_api.RecipeApi):
         goma_dir = self.c.compile_py.goma_dir
       if not goma_dir:  # pragma: no cover
         # TODO(phajdan.jr): remove fallback when we always use cipd for goma.
-        goma_dir = self.m.infra_paths['build'].join('goma')
+        goma_dir = self.m.path['build'].join('goma')
       args += ['--goma-dir', goma_dir]
 
     if isolated_targets: