Specify pnacl_newlib_dir to SCons when running nacl_integration

chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py

Index: chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
diff --git a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
index 2f301ced732901871d3e3dacf38974f0f791edb2..16af0441b9e4adbbf6dc53f6c2b5d703e4c194d3 100755
--- a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
+++ b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py
@@ -114,6 +114,7 @@ def BuildAndTest(options):
                                '%s_%s' % (os_name, arch_name))
   nacl_newlib_dir = os.path.join(toolchain_dir, 'nacl_%s_newlib' % arch_name)
   nacl_glibc_dir = os.path.join(toolchain_dir, 'nacl_%s_glibc' % arch_name)
+  pnacl_newlib_dir = os.path.join(toolchain_dir, 'pnacl_newlib')
 
   # Decide platform specifics.
   if options.browser_path:
@@ -220,6 +221,7 @@ def BuildAndTest(options):
       'chrome_browser_path=%s' % chrome_filename,
       'nacl_newlib_dir=%s' % nacl_newlib_dir,
       'nacl_glibc_dir=%s' % nacl_glibc_dir,
+      'pnacl_newlib_dir=%s' % pnacl_newlib_dir,
   ]
   if not options.integration_bot and not options.morenacl_bot:
     cmd.append('disable_flaky_tests=1')
@@ -233,15 +235,6 @@ def BuildAndTest(options):
     cmd.append('json_build_results_output_file=%s' %
                options.json_build_results_output_file)
 
-  # Download the toolchain(s).
-  pkg_ver_dir = os.path.join(NACL_DIR, 'build', 'package_version')
-  RunCommand([python, os.path.join(pkg_ver_dir, 'package_version.py'),
-              '--mode', 'nacl_core_sdk',
-              '--exclude', 'pnacl_newlib',
-              '--exclude', 'nacl_arm_newlib',
-              'sync', '--extract'],
-             NACL_DIR, os.environ)
-
   CleanTempDir()
 
   if options.enable_newlib: