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

net/BUILD.gn

 # Copyright (c) 2013 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("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 20 matching lines @@
 
 # Disable Kerberos on ChromeOS, Android and iOS, at least for now. It needs
 # configuration (krb5.conf and so on).
 use_kerberos = !is_chromeos && !is_android && !is_ios
 
 # The way the cache uses mmap() is inefficient on some Android devices. If
 # this flag is set, we hackily avoid using mmap() in the disk cache. We are
 # pretty confident that mmap-ing the index would not hurt any existing x86
 # android devices, but we cannot be so sure about the variety of ARM devices.
 # So enable it for x86 only for now.
-posix_avoid_mmap = is_android && cpu_arch != "x86"
+posix_avoid_mmap = is_android && current_cpu != "x86"
 
 # WebSockets and socket stream code are used everywhere except iOS.
 enable_websockets = !is_ios
 use_v8_in_net = !is_ios
 enable_built_in_dns = !is_ios
 disable_ftp_support = is_ios
 
 declare_args() {
   # Disables support for file URLs.  File URL support requires use of icu.
   disable_file_support = false
@@ skipping 16 matching lines @@
   cflags = []
   defines = [
     # TODO(GYP) Note that he GYP file supports linux_link_kerberos (defaults to
     # 0) which implies that we run pkg_config on kerberos and link to that
     # rather than setting this define which will dynamically open it. That
     # doesn't seem to be set in the regular builds, so we're skipping this
     # capability here.
     "DLOPEN_KERBEROS",
     "NET_IMPLEMENTATION",
   ]
+
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   public_configs = [ ":net_config" ]
   include_dirs = []
 
   public_deps = [
     "//crypto",
     "//crypto:platform",
   ]
   deps = [
@@ skipping 725 matching lines @@
     ]
   }
 }
 
 if (!is_ios && !is_android) {
   executable("crash_cache") {
     testonly = true
     sources = [
       "tools/crash_cache/crash_cache.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       ":net",
       ":test_support",
       "//base",
     ]
   }
 
   executable("crl_set_dump") {
     testonly = true
     sources = [
       "tools/crl_set_dump/crl_set_dump.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       ":net",
       "//base",
     ]
   }
 
   executable("dns_fuzz_stub") {
     testonly = true
     sources = [
       "tools/dns_fuzz_stub/dns_fuzz_stub.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       ":net",
       "//base",
     ]
   }
 
   executable("gdig") {
     testonly = true
     sources = [
       "tools/gdig/file_net_log.cc",
       "tools/gdig/gdig.cc",
     ]
     deps = [
       ":net",
       "//base",
     ]
   }
 
   executable("get_server_time") {
     testonly = true
     sources = [
       "tools/get_server_time/get_server_time.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       ":net",
       "//base",
       "//base:i18n",
       "//url",
     ]
   }
 
@@ skipping 32 matching lines @@
       "//base/test:test_support",
       "//testing/gtest",
     ]
   }
 
   executable("stress_cache") {
     testonly = true
     sources = [
       "disk_cache/blockfile/stress_cache.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       ":net",
       ":test_support",
       "//base",
     ]
   }
 
   executable("tld_cleanup") {
     sources = [
       "tools/tld_cleanup/tld_cleanup.cc",
     ]
+
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     deps = [
       "//base",
       "//base:i18n",
       "//net/tools/tld_cleanup",
     ]
   }
 }
 
@@ skipping 498 matching lines @@
       "quic/quic_server_bin.cc",
     ]
     deps = [
       ":quic_tools",
       ":net",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }  # !is_android && !is_win && !is_mac