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

chrome/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("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/version.gni")
 
@@ skipping 180 matching lines @@
         "//chrome_elf",
         "//content/app/resources",
         "//crypto",
         "//net:net_resources",
         "//third_party/wtl",
         "//ui/views",
       ]
       if (enable_configuration_policy) {
         deps += [ "//components/policy" ]
       }
-      if (cpu_arch == "x86") {
+      if (current_cpu == "x86") {
         # Add a dependency to custom import library for user32 delay imports only
         # in x86 builds.
         #deps += [ 'chrome_user32_delay_imports' ]  TODO(GYP)
       }
 
       # TODO(GYP) incremental linking flags in debug builds
       #'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
 
       # TODO(GYP) Lots of VCLinkerTool stuff on Windows.
 
@@ skipping 480 matching lines @@
       "//chrome/browser/ui",
       "//chrome/child",
       "//chrome/plugin",
       "//chrome/renderer",
       "//chrome/utility",
       "//components/enhanced_bookmarks",
       "//content/public/app:browser",
     ]
   }
 }