Update Chomium's build files to work w/ latest GN binaries.

sandbox/win/BUILD.gn

 # 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("//testing/test.gni")
 
 source_set("sandbox") {
   sources = [
     "src/acl.cc",
     "src/acl.h",
@@ skipping 117 matching lines @@
     "src/target_services.cc",
     "src/target_services.h",
     "src/win_utils.cc",
     "src/win_utils.h",
     "src/win2k_threadpool.cc",
     "src/win2k_threadpool.h",
     "src/window.cc",
     "src/window.h",
   ]
 
-  if (cpu_arch == "x64") {
+  if (current_cpu == "x64") {
     sources += [
       "src/interceptors_64.cc",
       "src/interceptors_64.h",
       "src/resolver_64.cc",
       "src/service_resolver_64.cc",
       "src/Wow64_64.cc",
     ]
-  } else if (cpu_arch == "x86") {
+  } else if (current_cpu == "x86") {
     sources += [
       "src/resolver_32.cc",
       "src/service_resolver_32.cc",
       "src/sidestep_resolver.cc",
       "src/sidestep_resolver.h",
       "src/sidestep/ia32_modrm_map.cpp",
       "src/sidestep/ia32_opcode_map.cpp",
       "src/sidestep/mini_disassembler_types.h",
       "src/sidestep/mini_disassembler.cpp",
       "src/sidestep/mini_disassembler.h",
       "src/sidestep/preamble_patcher_with_stub.cpp",
       "src/sidestep/preamble_patcher.h",
       "src/Wow64.cc",
       "src/Wow64.h",
     ]
   }
 
   deps = [
     ":copy_wow_helper",
     "//base",
   ]
 }
 
-if (cpu_arch == "x86") {
+if (current_cpu == "x86") {
   # Make a target that copies the wow_helper files to the out dir.
   #
   # TODO(brettw) we can probably just build this now that we have proper
   # toolchain support.
   copy("copy_wow_helper") {
     sources = [
       "wow_helper/wow_helper.exe",
       "wow_helper/wow_helper.pdb",
     ]
     outputs = [
@@ skipping 109 matching lines @@
     "sandbox_poc/pocdll/network.cc",
     "sandbox_poc/pocdll/pocdll.cc",
     "sandbox_poc/pocdll/processes_and_threads.cc",
     "sandbox_poc/pocdll/registry.cc",
     "sandbox_poc/pocdll/spyware.cc",
     "sandbox_poc/pocdll/utils.h",
   ]
 
   defines = [ "POCDLL_EXPORTS" ]
 }