Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/v8/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 argparse
 import datetime
 import random
 import re
 import urllib
 
@@ skipping 264 matching lines @@
     build_environment.update(self.c.gyp_env.as_jsonish())
     if 'GYP_DEFINES' in build_environment:
       # Filter out gomadir.
       build_environment['GYP_DEFINES'] = ' '.join(
           d for d in build_environment['GYP_DEFINES'].split()
             if not d.startswith('gomadir')
       )
     return build_environment
 
   def setup_mips_toolchain(self):
-    mips_dir = self.m.infra_paths['slave_build'].join(MIPS_DIR, 'bin')
+    mips_dir = self.m.path['slave_build'].join(MIPS_DIR, 'bin')
     if not self.m.path.exists(mips_dir):
       self.m.gsutil.download_url(
           'gs://chromium-v8/%s' % MIPS_TOOLCHAIN,
-          self.m.infra_paths['slave_build'],
+          self.m.path['slave_build'],
           name='bootstrapping mips toolchain')
       self.m.step('unzipping',
                ['tar', 'xf', MIPS_TOOLCHAIN],
-               cwd=self.m.infra_paths['slave_build'])
+               cwd=self.m.path['slave_build'])
 
     self.c.gyp_env.CC = self.m.path.join(mips_dir, 'mips-linux-gnu-gcc')
     self.c.gyp_env.CXX = self.m.path.join(mips_dir, 'mips-linux-gnu-g++')
     self.c.gyp_env.AR = self.m.path.join(mips_dir, 'mips-linux-gnu-ar')
     self.c.gyp_env.RANLIB = self.m.path.join(mips_dir, 'mips-linux-gnu-ranlib')
     self.c.gyp_env.LINK = self.m.path.join(mips_dir, 'mips-linux-gnu-g++')
 
   @property
   def bot_type(self):
     return self.bot_config.get('bot_type', 'builder_tester')
@@ skipping 62 matching lines @@
 
   def compile(self, **kwargs):
     self.m.chromium.compile(**kwargs)
     self.isolate_tests()
 
   # TODO(machenbach): This should move to a dynamorio module as soon as one
   # exists.
   def dr_compile(self):
     self.m.file.makedirs(
       'Create Build Dir',
-      self.m.infra_paths['slave_build'].join('dynamorio', 'build'))
+      self.m.path['slave_build'].join('dynamorio', 'build'))
     self.m.step(
       'Configure Release x64 DynamoRIO',
       ['cmake', '..', '-DDEBUG=OFF'],
-      cwd=self.m.infra_paths['slave_build'].join('dynamorio', 'build'),
+      cwd=self.m.path['slave_build'].join('dynamorio', 'build'),
     )
     self.m.step(
       'Compile Release x64 DynamoRIO',
       ['make', '-j5'],
-      cwd=self.m.infra_paths['slave_build'].join('dynamorio', 'build'),
+      cwd=self.m.path['slave_build'].join('dynamorio', 'build'),
     )
 
   @property
   def run_dynamorio(self):
     return self.m.gclient.c.solutions[-1].name == 'dynamorio'
 
   def upload_build(self, name_suffix='', archive=None):
     archive = archive or self.GS_ARCHIVES[self.bot_config['build_gs_archive']]
     self.m.archive.zip_and_upload_build(
           'package build' + name_suffix,
@@ skipping 508 matching lines @@
     variants += test.get('variants', variants)
     variants += test_step_config.variants
     full_args += variants.test_args
 
     # Add step-specific test arguments.
     full_args += test_step_config.test_args
 
     full_args = self._with_extra_flags(full_args)
 
     if self.run_dynamorio:
-      drrun = self.m.infra_paths['slave_build'].join(
+      drrun = self.m.path['slave_build'].join(
           'dynamorio', 'build', 'bin64', 'drrun')
       full_args += [
         '--command_prefix',
         '%s -reset_every_nth_pending 0 --' % drrun,
       ]
 
     # Indicate whether DCHECKs were enabled.
     if self.m.chromium.c.gyp_env.GYP_DEFINES.get('dcheck_always_on') == 1:
       full_args.append('--dcheck-always-on')
 
@@ skipping 200 matching lines @@
   def report_culprits(self, culprit_range):
     assert culprit_range
     if len(culprit_range) > 1:
       text = 'Suspecting multiple commits'
     else:
       text = 'Suspecting %s' % culprit_range[0][:8]
 
     step_result = self.m.step(text, cmd=None)
     for culprit in culprit_range:
       step_result.presentation.links[culprit[:8]] = COMMIT_TEMPLATE % culprit