Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.gpu.fyi.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 Win7_Audio_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 = src_cfg.solutions.add()
   soln.name = "src-internal"
   soln.url = "svn://svn.chromium.org/chrome-internal/trunk/src-internal"
@@ skipping 19 matching lines @@
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   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', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0',
       'GYP_DEFINES': 'fastbuild=1 component=static_library'}
   api.python("gclient runhooks wrapper",
-      api.infra_paths['build'].join("scripts", "slave", "runhooks_wrapper.py"),
+      api.path["build"].join("scripts", "slave", "runhooks_wrapper.py"),
       env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # compile.py step
   args = ['--solution', 'all.sln', '--project', 'chromium_builder_tests',
       '--target', 'Release']
   # buildbot sets 'clobber' to the empty string which is falsey, check with 'in'
   if 'clobber' in api.properties:
     args.append("--clobber")
   api.step("compile", ["python_slave",
-    api.infra_paths['build'].join("scripts", "slave", "compile.py")] + args)
+    api.path["build"].join("scripts", "slave", "compile.py")] + args)
   # runtest step
   api.step("content_unittests",
-      ["python_slave", api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+      ["python_slave", api.path["build"].join("scripts", "slave", "runtest.py"),
        '--target', 'Release',
        "--build-properties=%s" % api.json.dumps(build_properties,
          separators=(',', ':')),
        '--factory-properties={"blink_config":"chromium","gclient_env":{"CHROM'+\
        'IUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":"fas'+\
        'tbuild=1 component=static_library","LANDMINES_VERBOSE":"1"},"generate'+\
        '_gtest_json":true,"test_results_server":"test-results.appspot.com"}',
        '--annotate=gtest', '--test-type', 'content_unittests',
        '--generate-json-file', '-o', 'gtest-results/content_unittests',
        '--build-number', api.properties["buildnumber"], '--builder-name',
        api.properties["buildername"], 'content_unittests.exe',
        '--gtest_print_time'])
   # runtest step
   api.step("media_unittests",
-      ["python_slave", api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+      ["python_slave", api.path["build"].join("scripts", "slave", "runtest.py"),
        '--target', 'Release',
        "--build-properties=%s" % api.json.dumps(build_properties,
          separators=(',', ':')),
        '--factory-properties={"blink_config":"chromium","gclient_env":{"CHROM'+\
        'IUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":"fas'+\
        'tbuild=1 component=static_library","LANDMINES_VERBOSE":"1"},"generate'+\
        '_gtest_json":true,"test_results_server":"test-results.appspot.com"}',
        '--annotate=gtest', '--test-type', 'media_unittests',
        '--generate-json-file', '-o', 'gtest-results/media_unittests',
        '--build-number', api.properties["buildnumber"], '--builder-name',
@@ skipping 36 matching lines @@
   result = api.bot_update.ensure_checkout(force=True)
   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',
       'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0',
       'GYP_DEFINES': ' component=static_library'}
   api.python("gclient runhooks wrapper",
-      api.infra_paths['build'].join("scripts", "slave", "runhooks_wrapper.py"),
+      api.path["build"].join("scripts", "slave", "runhooks_wrapper.py"),
       env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
   # compile.py step
   args = ['--target', 'Release', 'content_unittests', 'media_unittests']
 
   # buildbot sets 'clobber' to the empty string which is falsey, check with 'in'
   if 'clobber' in api.properties:
     args.append("--clobber")
   api.python("compile",
-      api.infra_paths['build'].join("scripts", "slave", "compile.py"), args=args)
+      api.path["build"].join("scripts", "slave", "compile.py"), args=args)
   # runtest step
   api.python("content_unittests",
-      api.infra_paths['build'].join("scripts", "slave","runtest.py"),
+      api.path["build"].join("scripts", "slave","runtest.py"),
       args=['--target', 'Release',
         "--build-properties=%s" % api.json.dumps(build_properties,
           separators=(',', ':')),
         '--factory-properties={"blink_config":"chromium","gclient_env":{"CHRO'+\
         'MIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":" '+\
         'component=static_library","LANDMINES_VERBOSE":"1"},"generate_gtest_j'+\
         'son":true,"test_results_server":"test-results.appspot.com"}',
         '--annotate=gtest', '--test-type', 'content_unittests',
         '--generate-json-file', '-o', 'gtest-results/content_unittests',
         '--build-number', api.properties["buildnumber"], '--builder-name',
         api.properties["buildername"], 'content_unittests',
         '--gtest_print_time'])
   # runtest step
   api.python("media_unittests",
-      api.infra_paths['build'].join("scripts", "slave","runtest.py"),
+      api.path["build"].join("scripts", "slave","runtest.py"),
       args=['--target', 'Release',
         "--build-properties=%s" % api.json.dumps(build_properties,
           separators=(',', ':')),
         '--factory-properties={"blink_config":"chromium","gclient_env":{"CHRO'+\
         'MIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":" '+\
         'component=static_library","LANDMINES_VERBOSE":"1"},"generate_gtest_j'+\
         'son":true,"test_results_server":"test-results.appspot.com"}',
         '--annotate=gtest', '--test-type', 'media_unittests',
         '--generate-json-file', '-o', 'gtest-results/media_unittests',
         '--build-number', api.properties["buildnumber"], '--builder-name',
@@ skipping 37 matching lines @@
     api.properties(buildername='Linux Audio') +
     api.properties(slavename='TestSlave') +
     api.properties(buildnumber=42) +
     api.properties(clobber=True)
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='chromium.gpu.fyi') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )