Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/vs_toolchain.py

 # Copyright 2014 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.
 
 import json
 import os
 import pipes
 import shutil
 import subprocess
 import sys
@@ skipping 111 matching lines @@
     pgo_runtime_dll = 'pgort120.dll'
     source_x86 = os.path.join(pgo_x86_runtime_dir, pgo_runtime_dll)
     if os.path.exists(source_x86):
       _CopyRuntimeImpl(os.path.join(out_release, pgo_runtime_dll), source_x86)
     source_x64 = os.path.join(pgo_x64_runtime_dir, pgo_runtime_dll)
     if os.path.exists(source_x64):
       _CopyRuntimeImpl(os.path.join(out_release_x64, pgo_runtime_dll),
                        source_x64)
 
 
-def CopyDlls(target_dir, configuration, target_cpu):
+def CopyDlls(target_dir, configuration, cpu_arch):
   """Copy the VS runtime DLLs into the requested directory as needed.
 
   configuration is one of 'Debug' or 'Release'.
-  target_cpu is one of 'x86' or 'x64'.
+  cpu_arch is one of 'x86' or 'x64'.
 
   The debug configuration gets both the debug and release DLLs; the
   release config only the latter.
   """
   vs2013_runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
   if not vs2013_runtime_dll_dirs:
     return
 
   x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
-  runtime_dir = x64_runtime if target_cpu == 'x64' else x86_runtime
+  runtime_dir = x64_runtime if cpu_arch == 'x64' else x86_runtime
   _CopyRuntime(target_dir, runtime_dir, 'msvc%s120.dll')
   if configuration == 'Debug':
     _CopyRuntime(target_dir, runtime_dir, 'msvc%s120d.dll')
 
 
 def _GetDesiredVsToolchainHashes():
   """Load a list of SHA1s corresponding to the toolchains that we want installed
   to build with."""
   sha1path = os.path.join(script_dir, 'toolchain_vs2013.hash')
   with open(sha1path, 'rb') as f:
@@ skipping 55 matching lines @@
       'copy_dlls': CopyDlls,
   }
   if len(sys.argv) < 2 or sys.argv[1] not in commands:
     print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
     return 1
   return commands[sys.argv[1]](*sys.argv[2:])
 
 
 if __name__ == '__main__':
   sys.exit(main())