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

content/common/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/ui.gni")
 import("//content/common/common.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
-if (is_chromeos && cpu_arch != "arm") {
+if (is_chromeos && current_cpu != "arm") {
   action("libva_generate_stubs") {
     extra_header = "gpu/media/va_stub_header.fragment"
 
     script = "../../tools/generate_stubs/generate_stubs.py"
     sources = [
       "gpu/media/va.sigs",
     ]
     inputs = [
       extra_header,
     ]
@@ skipping 254 matching lines @@
       sources -= [ "font_list_ozone.cc" ]
     }
   } else {
     sources -= [ "font_list_pango.cc" ]
   }
 
   if (use_x11) {
     include_dirs += [ "//third_party/khronos" ]
     configs += [ "//build/config/linux:xcomposite" ]
 
-    if (cpu_arch != "arm" || !is_chromeos) {
+    if (current_cpu != "arm" || !is_chromeos) {
       sources += [
         "gpu/x_util.cc",
         "gpu/x_util.h",
       ]
     }
   }
 
   if (enable_plugins) {
     deps += [ "//ppapi/shared_impl" ]
   } else {
@@ skipping 52 matching lines @@
         "gpu/media/vp8_decoder.cc",
         "gpu/media/vp8_decoder.h",
         "gpu/media/vp8_picture.cc",
         "gpu/media/vp8_picture.h",
       ]
       libs = [
         "EGL",
         "GLESv2",
       ]
     }
-    if (cpu_arch == "arm") {
+    if (current_cpu == "arm") {
       sources += [
         "gpu/media/tegra_v4l2_video_device.cc",
         "gpu/media/tegra_v4l2_video_device.h",
       ]
     }
-    if (cpu_arch != "arm") {
+    if (current_cpu != "arm") {
       sources += [
                    "gpu/media/va_surface.h",
                    "gpu/media/vaapi_h264_decoder.cc",
                    "gpu/media/vaapi_h264_decoder.h",
                    "gpu/media/vaapi_h264_dpb.cc",
                    "gpu/media/vaapi_h264_dpb.h",
                    "gpu/media/vaapi_picture.cc",
                    "gpu/media/vaapi_picture.h",
                    "gpu/media/vaapi_video_decode_accelerator.cc",
                    "gpu/media/vaapi_video_decode_accelerator.h",
@@ skipping 75 matching lines @@
       ]
     }
     if (is_android) {
       sources -= [
         "sandbox_linux/android/sandbox_bpf_base_policy_android.cc",
         "sandbox_linux/android/sandbox_bpf_base_policy_android.h",
       ]
     }
   }
 
-  if (is_win && cpu_arch == "x64") {
+  if (is_win && current_cpu == "x64") {
     # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
     cflags = [ "/bigobj" ]
   }
 }
 
 mojom("mojo_bindings") {
   sources = [
     "application_setup.mojom",
     "geolocation_service.mojom",
     "permission_service.mojom",
     "presentation/presentation_service.mojom",
     "render_frame_setup.mojom",
   ]
 
   deps = [
     "//content/public/common:mojo_bindings",
     "//third_party/mojo/src/mojo/public/interfaces/application:application",
   ]
 }