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

media/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/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
 # Common configuration for targets in the media directory.
 # NOT for exporting.
 config("media_config") {
   defines = [ "MEDIA_IMPLEMENTATION" ]
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
   }
   if (!media_use_ffmpeg) {
     defines += [ "MEDIA_DISABLE_FFMPEG" ]
   }
-  if (cpu_arch == "arm" && arm_use_neon) {
+  if (current_cpu == "arm" && arm_use_neon) {
     defines += [ "USE_NEON" ]
   }
   if (use_pulseaudio) {
     defines += [ "USE_PULSEAUDIO" ]
     if (!link_pulseaudio) {
       defines += [ "DLOPEN_PULSEAUDIO" ]
     }
   }
   if (use_cras) {
     defines += [ "USE_CRAS" ]
@@ skipping 213 matching lines @@
     "video/picture.cc",
     "video/picture.h",
     "video/video_decode_accelerator.cc",
     "video/video_decode_accelerator.h",
     "video/video_encode_accelerator.cc",
     "video/video_encode_accelerator.h",
   ]
 
   configs += [
     ":media_config",
+
     # TODO(wolenetz): Fix size_t to int trunctaion in win64.
     # See http://crbug.com/171009
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
   all_dependent_configs = [ ":media_dependent_config" ]
 
   cflags = []
   libs = []
   defines = []
   deps = []
@@ skipping 23 matching lines @@
     if (proprietary_codecs) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter.cc",
         "filters/ffmpeg_aac_bitstream_converter.h",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter.h",
       ]
     }
   }
 
-  if (cpu_arch == "arm" && arm_use_neon) {
+  if (current_cpu == "arm" && arm_use_neon) {
     defines += [ "USE_NEON" ]
   }
 
   if (media_use_libvpx) {
     sources += [
       "filters/vpx_video_decoder.cc",
       "filters/vpx_video_decoder.h",
     ]
     deps += [ "//third_party/libvpx" ]
   }
@@ skipping 24 matching lines @@
     deps += [
       "//media/base/android",
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
     if (!is_android_webview_build) {
       deps += [ "//media/base/android:media_java" ]
     }
   }
 
-  if (cpu_arch != "arm" && is_chromeos) {
+  if (current_cpu != "arm" && is_chromeos) {
     sources += [
       "filters/h264_bitstream_buffer.cc",
       "filters/h264_bitstream_buffer.h",
     ]
   }
 
   if (use_alsa) {
     libs += [ "asound" ]
     defines += [ "USE_ALSA" ]
     sources += [
@@ skipping 262 matching lines @@
       "filters/audio_decoder_unittest.cc",
       "filters/audio_file_reader_unittest.cc",
       "filters/blocking_url_protocol_unittest.cc",
       "filters/ffmpeg_demuxer_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
       "filters/ffmpeg_video_decoder_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
     ]
   }
 
-  if (cpu_arch != "arm" && is_chromeos) {
+  if (current_cpu != "arm" && is_chromeos) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "filters/ffmpeg_aac_bitstream_converter_unittest.cc",
       "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
       "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
       "formats/common/stream_parser_test_base.cc",
       "formats/common/stream_parser_test_base.h",
@@ skipping 153 matching lines @@
     deps = [
       ":media",
       ":shared_memory_support",
       "//base",
       "//ui/gl",
       "//ui/gfx",
       "//ui/gfx/geometry",
     ]
   }
 }