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

chrome/test/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 
@@ skipping 1495 matching lines @@
       deps += [ "//ui/events/devices" ]
       data_deps += [ "//tools/xdisplaycheck" ]
     } else {
       sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
     }
     if (cld_version == 0 || cld_version == 2) {
       # Unit tests should be independent of the CLD2 access mechanism, just use
       # static for simplicity.
       deps += [ "//third_party/cld_2:cld2_static" ]
     }
-    if (is_desktop_linux && cpu_arch == "x64") {
+    if (is_desktop_linux && current_cpu == "x64") {
       # Only add this test for 64 bit builds because otherwise we need the 32
       # bit library on 64 bit systems when running this test.
       sources +=
           [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
       configs += [
         "//chrome/browser:gnome_keyring",
         "//chrome/browser:gnome_keyring_direct",
       ]
     }
     if (is_linux && !is_chromeos) {
       sources +=
           [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
     }
     if (is_linux && use_aura) {
       deps += [
         "//dbus",
         "//dbus:test_support",
         "//ui/aura:test_support",
       ]
     }
-    if (is_linux && is_chrome_branded && cpu_arch == "x86") {
+    if (is_linux && is_chrome_branded && current_cpu == "x86") {
       ldflags = [ "-Wl,--strip-debug" ]
     }
     if (is_mac) {
       sources += rebase_path(unit_gypi_values.chrome_unit_tests_mac_sources,
                              ".",
                              "//chrome")
       sources -= [
         "../browser/ui/tests/ui_gfx_image_unittest.cc",
         "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
         "../tools/convert_dict/convert_dict_unittest.cc",
@@ skipping 120 matching lines @@
     }
     if (use_ozone) {
       # crbug.com/354036
       sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
     }
     if (!enable_plugin_installation) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
 }