Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromium_android/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 contextlib
 import datetime
 import json
 import os
 import re
 import urllib
@@ skipping 101 matching lines @@
       refs = [refs]
     if use_bot_update:
       result = self.m.bot_update.ensure_checkout(
           spec, refs=refs, with_branch_heads=with_branch_heads, force=True)
     else:
       result = self.m.gclient.checkout(spec, with_branch_heads=with_branch_heads)
 
     # TODO(sivachandra): Manufacture gclient spec such that it contains "src"
     # solution + repo_name solution. Then checkout will be automatically
     # correctly set by gclient.checkout
-    self.m.path['checkout'] = self.m.infra_paths['slave_build'].join('src')
+    self.m.path['checkout'] = self.m.path['slave_build'].join('src')
 
     self.clean_local_files()
 
     return result
 
   def clean_local_files(self):
     target = self.c.BUILD_CONFIG
     debug_info_dumps = self.m.path['checkout'].join('out',
                                                     target,
                                                     'debug_info_dumps')
@@ skipping 30 matching lines @@
     # TODO(sivachandra): Disable subannottations after cleaning up
     # tree_truth.sh.
     self.m.step('tree truth steps',
                 [self.m.path['checkout'].join('build', 'tree_truth.sh'),
                 self.m.path['checkout']] + repos,
                 allow_subannotations=False)
 
   def git_number(self, **kwargs):
     return self.m.step(
         'git_number',
-        [self.m.infra_paths['depot_tools'].join('git_number.py')],
+        [self.m.path['depot_tools'].join('git_number.py')],
         stdout = self.m.raw_io.output(),
         step_test_data=(
           lambda:
             self.m.raw_io.test_api.stream_output('3000\n')
         ),
         cwd=self.m.path['checkout'],
         infra_step=True,
         **kwargs)
 
   def java_method_count(self, dexfile, name='java_method_count'):
@@ skipping 70 matching lines @@
 
   def zip_and_upload_build(self, bucket):
     # TODO(luqui): Unify make_zip_archive and upload_build with this
     # (or at least make the difference clear).
     self.m.archive.zip_and_upload_build(
         'zip_build',
         target=self.m.chromium.c.BUILD_CONFIG,
         # We send None as the path so that zip_build.py gets it from factory
         # properties.
         build_url=None,
-        src_dir=self.m.infra_paths['slave_build'].join('src'),
+        src_dir=self.m.path['slave_build'].join('src'),
         exclude_files='lib.target,gen,android_webview,jingle_unittests')
 
   def create_adb_symlink(self):
     # Creates a sym link to the adb executable in the home dir
     self.m.python(
         'create adb symlink',
         self.m.path['checkout'].join('build', 'symlink.py'),
         ['-f', self.m.adb.adb_path(), os.path.join('~', 'adb')],
         infra_step=True)
 
@@ skipping 45 matching lines @@
       skip_wipe=skip_wipe, disable_location=disable_location,
       min_battery_level=min_battery_level, disable_network=disable_network,
       disable_java_debug=disable_java_debug, reboot_timeout=reboot_timeout,
       max_battery_temp=max_battery_temp)
 
   @property
   def blacklist_file(self):
     return self.out_path.join('bad_devices.json')
 
   def device_status_check(self, restart_usb=False, **kwargs):
-    # TODO(phajdan.jr): Remove infra_paths['build'] usage, http://crbug.com/437264 .
-    devices_path = self.m.infra_paths['build'].join('site_config', '.known_devices')
+    # TODO(phajdan.jr): Remove path['build'] usage, http://crbug.com/437264 .
+    devices_path = self.m.path['build'].join('site_config', '.known_devices')
     args = [
         '--json-output', self.m.json.output(),
         '--blacklist-file', self.blacklist_file,
         '--known-devices-file', devices_path,
     ]
     if restart_usb:
       args += ['--restart-usb']
 
     try:
       result = self.m.step(
@@ skipping 544 matching lines @@
     self.logcat_dump(gs_bucket=logcat_gs_bucket)
     self.stack_tool_steps()
     if self.c.gce_setup:
       self.shutdown_gce_instances(count=self.c.gce_count)
     self.test_report()
 
   def run_bisect_script(self, extra_src='', path_to_config='', **kwargs):
     self.m.step('prepare bisect perf regression',
         [self.m.path['checkout'].join('tools',
                                       'prepare-bisect-perf-regression.py'),
-         '-w', self.m.infra_paths['slave_build']])
+         '-w', self.m.path['slave_build']])
 
     args = []
     if extra_src:
       args = args + ['--extra_src', extra_src]
     if path_to_config:
       args = args + ['--path_to_config', path_to_config]
     self.m.step('run bisect perf regression',
         [self.m.path['checkout'].join('tools',
                                       'run-bisect-perf-regression.py'),
-         '-w', self.m.infra_paths['slave_build']] + args, **kwargs)
+         '-w', self.m.path['slave_build']] + args, **kwargs)
 
   def run_test_suite(self, suite, verbose=True, isolate_file_path=None,
                      gtest_filter=None, tool=None, flakiness_dashboard=None,
                      name=None, json_results_file=None, shard_timeout=None,
                      args=None, **kwargs):
     args = args or []
     args.extend(['--blacklist-file', self.blacklist_file])
     if verbose:
       args.append('--verbose')
     # TODO(agrieve): Remove once no more tests pass isolate_file_path (contained
@@ skipping 343 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)