Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py

 # Copyright 2016 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.
 
 DEPS = [
   'depot_tools/bot_update',
   'chromium',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
 ]
 
 def Linux32_steps(api):
   # update scripts step; implicitly run by recipe engine.
   # bot_update step
@@ skipping 31 matching lines @@
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0',
       'GYP_DEFINES':
       'branding=Chrome buildtype=Official component=static_library'}
-  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
+  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # chromedriver compile.py step
-  api.python("compile", api.infra_paths['build'].join("scripts", "slave",
+  api.python("compile", api.path["build"].join("scripts", "slave",
     "compile.py"), args=['--target', 'Release',
       'chromium_builder_chromedriver'])
   # annotated_steps step
-  api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
+  api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":'+\
           '"chromedriver_buildbot_run.py","blink_config":"chromium",'+\
           '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\
           '"DEPOT_TOOLS_UPDATE"'':"0","GYP_DEFINES":"branding=Chrome '+\
           'buildtype=Official component=static_library","LANDMINES_VERBOSE":'+\
           '"1"},"needs_webdriver_java_tests":true,"use_xvfb_on_linux":true}'],
     allow_subannotations=True)
 
@@ skipping 33 matching lines @@
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES': ' component=static_library'}
-  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
+  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # chromedriver compile.py step
-  api.python("compile", api.infra_paths['build'].join("scripts", "slave",
+  api.python("compile", api.path["build"].join("scripts", "slave",
     "compile.py"), args=['--target', 'Release', '--', '-project',
       '../build/all.xcodeproj', '-target', 'chromium_builder_chromedriver'])
   # annotated_steps step
-  api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
+  api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"c'+\
           'hromedriver_buildbot_run.py","blink_config":"chromium","gclient_e'+\
           'nv":{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP'+\
           '_DEFINES":" component=static_library","LANDMINES_VERBOSE":"1"},"ne'+\
           'eds_webdriver_java_tests":true}'], allow_subannotations=True)
 
 
 def Win7_steps(api):
   # update scripts step; implicitly run by recipe engine.
   # taskkill step
-  api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+  api.python("taskkill", api.path["build"].join("scripts", "slave",
     "kill_processes.py"))
   # bot_update step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "src"
   soln.url = "https://chromium.googlesource.com/chromium/src.git"
   soln.custom_deps = {'src/chrome/test/chromedriver/third_party/java_tests':
       'https://chromium.googlesource.com/chromium/deps/webdriver'}
   soln = src_cfg.solutions.add()
   soln.name = "src-internal"
@@ skipping 21 matching lines @@
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0','GYP_DEFINES': ' component=static_library'}
-  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
+  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # chromedriver compile.py step
-  api.step("compile", ["python_slave", api.infra_paths['build'].join("scripts",
+  api.step("compile", ["python_slave", api.path["build"].join("scripts",
     "slave", "compile.py"), '--solution', 'all.sln', '--project',
     'chromium_builder_chromedriver', '--target', 'Release'])
   # annotated_steps step
-  api.step("annotated_steps", ["python_slave", api.infra_paths['build'].join("scripts",
+  api.step("annotated_steps", ["python_slave", api.path["build"].join("scripts",
     "slave", "chromium", "chromedriver_buildbot_run.py"),
     '--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
           'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
           '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
           'INES":" component=static_library","LANDMINES_VERBOSE":"1"},"needs_'+\
           'webdriver_java_tests":true}'], allow_subannotations=True)
 
 
 def Linux_steps(api):
@@ skipping 32 matching lines @@
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES':
       'branding=Chrome buildtype=Official component=static_library'}
-  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
+  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # chromedriver compile.py step
-  api.python("compile", api.infra_paths['build'].join("scripts", "slave",
+  api.python("compile", api.path["build"].join("scripts", "slave",
     "compile.py"), args=['--target', 'Release',
       'chromium_builder_chromedriver'])
   # annotated_steps step
-  api.python("annotated_steps", api.infra_paths['build'].join("scripts", "slave",
+  api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
           'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
           '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
           'INES":"branding=Chrome buildtype=Official component=static_library'+\
           '","LANDMINES_VERBOSE":"1"},"needs_webdriver_java_tests":true,"use_'+\
           'xvfb_on_linux":true}'], allow_subannotations=True)
 
 
@@ skipping 30 matching lines @@
   yield (api.test('Linux') +
     api.properties(mastername='chromium.chromedriver') +
     api.properties(buildername='Linux') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='chromium.chromedriver') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )