Update from https://crrev.com/316786

build/toolchain/win/setup_toolchain.py

 # Copyright (c) 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.
+#
+# Copies the given "win tool" (which the toolchain uses to wrap compiler
+# invocations) and the environment blocks for the 32-bit and 64-bit builds on
+# Windows to the build directory.
+#
+# The arguments are the visual studio install location and the location of the
+# win tool. The script assumes that the root build directory is the current dir
+# and the files will be written to the current directory.
 
 import errno
 import os
 import re
 import subprocess
 import sys
 
-"""
-Copies the given "win tool" (which the toolchain uses to wrap compiler
-invocations) and the environment blocks for the 32-bit and 64-bit builds on
-Windows to the build directory.
-
-The arguments are the visual studio install location and the location of the
-win tool. The script assumes that the root build directory is the current dir
-and the files will be written to the current directory.
-"""
-
 
 def _ExtractImportantEnvironment(output_of_set):
   """Extracts environment variables required for the toolchain to run from
   a textual dump output by the cmd.exe 'set' command."""
   envvars_to_save = (
       'goma_.*', # TODO(scottmg): This is ugly, but needed for goma.
       'include',
       'lib',
       'libpath',
       'path',
@@ skipping 66 matching lines @@
                              '# Generated by setup_toolchain.py do not edit.\n']
                             + tool_source[1:]))
 
 
 def main():
   if len(sys.argv) != 6:
     print('Usage setup_toolchain.py '
           '<visual studio path> <win tool path> <win sdk path> '
           '<runtime dirs> <cpu_arch>')
     sys.exit(2)
-  vs_path = sys.argv[1]
   tool_source = sys.argv[2]
   win_sdk_path = sys.argv[3]
   runtime_dirs = sys.argv[4]
   cpu_arch = sys.argv[5]
 
   _CopyTool(tool_source)
 
   archs = ('x86', 'x64')
   assert cpu_arch in archs
   vc_bin_dir = ''
@@ skipping 30 matching lines @@
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + arch, 'wb') as f:
       f.write(env_block)
 
   assert vc_bin_dir
   print 'vc_bin_dir = "%s"' % vc_bin_dir
 
 
 if __name__ == '__main__':
   main()