Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.fyi.drmemory_win_block.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 = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/step',
     'trigger',
 ]
 
 
 def Windows_Tests__DrMemory__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # 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/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_CHROMIUM_NO_ACTION': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # extract build step
     api.python(
         "extract build",
-        api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+        api.path["build"].join("scripts", "slave", "extract_build.py"),
         args=["--target", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
                              separators=(',', ':'))])
     with api.step.defer_results():
       # runtest step
       api.python(
           "memory test: webkit",
-          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+          api.path["build"].join("scripts", "slave", "runtest.py"),
           args=
           ['--run-shell-script', '--target', 'Release',
             "--build-properties=%s" %
            api.json.dumps(build_properties,
                           separators=(',', ':')),
            '--factory-properties={"blink_config":"chromium","gclient_env":'+\
                '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
                '"GYP_CHROMIUM_NO_ACTION":"1","GYP_DEFINES":'+\
                '" component=static_library","LANDMINES_VERBOSE":"1"},'+\
                '"halt_on_missing_build":true}',
            '--annotate=gtest', '--test-type', 'memory test: webkit',
            '--pass-build-dir', '--pass-target',
            r'../../../src\tools\valgrind\chrome_tests.bat', '--test', 'webkit',
            '--tool', 'drmemory_light'])
       # runtest step
       api.python(
           "memory test: webkit",
-          api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+          api.path["build"].join("scripts", "slave", "runtest.py"),
           args=
           ['--run-shell-script', '--target', 'Release',
             "--build-properties=%s" %
            api.json.dumps(build_properties,
                           separators=(',', ':')),
            '--factory-properties={"blink_config":"chromium","gclient_env":'+\
                '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
                '"GYP_CHROMIUM_NO_ACTION":"1","GYP_DEFINES":'+\
                '" component=static_library","LANDMINES_VERBOSE":"1"},'+\
                '"halt_on_missing_build":true}',
            '--annotate=gtest', '--test-type', 'memory test: webkit',
            '--pass-build-dir', '--pass-target',
            r'../../../src\tools\valgrind\chrome_tests.bat', '--test', 'webkit',
            '--tool', 'drmemory_full'])
 
 
 def Windows_Browser__DrMemory_light___1__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # 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/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_CHROMIUM_NO_ACTION': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # extract build step
     api.python(
         "extract build",
-        api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+        api.path["build"].join("scripts", "slave", "extract_build.py"),
         args=["--target", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
                              separators=(',', ':'))])
     # runtest step
     api.python(
         "memory test: browser_tests",
-        api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+        api.path["build"].join("scripts", "slave", "runtest.py"),
         args=
         ['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
          api.json.dumps(build_properties,
                         separators=(',', ':')),
          '--factory-properties={"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_CHROMIUM_NO_ACTION":"1","GYP_DEFINES":'+\
              '" component=static_library","LANDMINES_VERBOSE":"1"},'+\
              '"halt_on_missing_build":true,"retry_failed":false}',
          '--annotate=gtest', '--test-type',
          'memory test: browser_tests_1_of_2', '--pass-build-dir',
          '--pass-target', '--shard-index', '1', '--total-shards', '2',
          r'../../../src\tools\valgrind\chrome_tests.bat', '--test',
          'browser_tests', '--tool', 'drmemory_light'])
 
 
 def Windows_Builder__DrMemory__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # 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/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'build_for_tool=drmemory component=shared_library',
            'LANDMINES_VERBOSE': '1'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--solution', 'out.sln', '--target', 'Release',
             '--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win']
     if "clobber" in api.properties:
         args.append("--clobber")
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # zip_build step
     step_result = api.python(
         "zip build",
-        api.infra_paths['build'].join("scripts", "slave", "zip_build.py"),
+        api.path["build"].join("scripts", "slave", "zip_build.py"),
         args=
         ["--json-urls", api.json.output(),
          "--target", "Release", '--build-url',
          'gs://chromium-build-transfer/drm-cr', '--build-properties=%s' %
          api.json.dumps(build_properties,
                         separators=(',', ':')),
          '--factory-properties={"blink_config":"chromium","build_url":'+\
              '"gs://chromium-build-transfer/drm-cr","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0"'+\
              ',"GYP_DEFINES":'+\
@@ skipping 120 matching lines @@
           "root": build_properties.get("root", ""), }},
     ]
     api.trigger(*trigger_spec)
 
 
 def Windows_Browser__DrMemory_light___2__steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # 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/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk',
                         'googlecode_url': 'http://%s.googlecode.com/svn',
                         'nacl_trunk':
@@ skipping 11 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_CHROMIUM_NO_ACTION': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': ' component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # extract build step
     api.python(
         "extract build",
-        api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+        api.path["build"].join("scripts", "slave", "extract_build.py"),
         args=["--target", "Release", "--build-archive-url", build_properties[
             "parent_build_archive_url"], '--build-properties=%s' %
               api.json.dumps(build_properties,
                              separators=(',', ':'))])
     # runtest step
     api.python(
         "memory test: browser_tests",
-        api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+        api.path["build"].join("scripts", "slave", "runtest.py"),
         args=
         ['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
          api.json.dumps(build_properties,
                         separators=(',', ':')),
          '--factory-properties={"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_CHROMIUM_NO_ACTION":"1","GYP_DEFINES":'+\
              '" component=static_library","LANDMINES_VERBOSE":"1"},'+\
              '"halt_on_missing_build":true,"retry_failed":false}',
          '--annotate=gtest', '--test-type',
@@ skipping 67 matching lines @@
     api.properties(got_revision='123456789abcdef') +
     api.properties(buildnumber='42') +
     api.properties(parent_build_archive_url='abc') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='chromium.fyi') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )