Update monet.

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 30 matching lines @@
 # 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 && current_cpu != "x86"
 
 # WebSockets and socket stream code are used everywhere except iOS.
 enable_websockets = !is_ios
 use_v8_in_net = false
 enable_built_in_dns = !is_ios
 disable_ftp_support = is_ios
 
+# NOTE(vtl): This was "moved" from //build/config/features.gni.
+enable_mdns = is_linux
+
 declare_args() {
   # Disables support for file URLs.  File URL support requires use of icu.
   disable_file_support = false
 }
 
 config("net_config") {
   defines = []
   if (posix_avoid_mmap) {
     defines += [ "POSIX_AVOID_MMAP" ]
   }
@@ skipping 221 matching lines @@
   } else if (is_android) {
     # Android doesn't use these even when using OpenSSL.
     sources -= [
       "base/openssl_private_key_store_memory.cc",
       "cert/cert_database_openssl.cc",
       "cert/cert_verify_proc_openssl.cc",
       "cert/test_root_certs_openssl.cc",
     ]
   }
 
-  if (use_glib && !is_chromeos) {
-    configs += [ "//build/config/linux:gconf" ]
-    deps += [ "//build/config/linux:gio" ]
-  }
-
   if (is_linux) {
     configs += [ "//build/config/linux:libresolv" ]
   }
 
   if (!use_nss_certs) {
     sources -= [
       "base/crypto_module_nss.cc",
       "base/keygen_handler_nss.cc",
       "cert/cert_database_nss.cc",
       "cert/nss_cert_database.cc",
@@ skipping 78 matching lines @@
       "websockets/websocket_handshake_stream_create_helper.cc",
       "websockets/websocket_handshake_stream_create_helper.h",
       "websockets/websocket_inflater.cc",
       "websockets/websocket_inflater.h",
       "websockets/websocket_mux.h",
       "websockets/websocket_stream.cc",
       "websockets/websocket_stream.h",
     ]
   }
 
-  if (!enable_mdns) {
+  # Was "!enable_mdns".
+  if (!is_linux) {
     sources -= [
       "dns/mdns_cache.cc",
       "dns/mdns_cache.h",
       "dns/mdns_client.cc",
       "dns/mdns_client.h",
       "dns/mdns_client_impl.cc",
       "dns/mdns_client_impl.h",
       "dns/record_parsed.cc",
       "dns/record_parsed.h",
       "dns/record_rdata.cc",
@@ skipping 156 matching lines @@
     "tools/dump_cache/url_to_filename_encoder.cc",
     "tools/dump_cache/url_to_filename_encoder.h",
     "tools/dump_cache/url_utilities.cc",
     "tools/dump_cache/url_utilities.h",
   ]
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
-    "//base",
     ":net",
     ":test_support",
+    "//base",
   ]
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
     "base/load_timing_info_test_util.cc",
     "base/load_timing_info_test_util.h",
     "base/mock_file_stream.cc",
     "base/mock_file_stream.h",
@@ skipping 336 matching lines @@
 
   executable("hpack_example_generator") {
     testonly = true
     sources = [
       "spdy/fuzzing/hpack_example_generator.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",
-      ":net",
     ]
   }
 
   executable("hpack_fuzz_mutator") {
     testonly = true
     sources = [
       "spdy/fuzzing/hpack_fuzz_mutator.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",
-      ":net",
     ]
   }
 
   executable("hpack_fuzz_wrapper") {
     testonly = true
     sources = [
       "spdy/fuzzing/hpack_fuzz_wrapper.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",
-      ":net",
     ]
   }
 
   if (use_v8_in_net) {
     executable("net_watcher") {
       testonly = true
       sources = [
         "tools/net_watcher/net_watcher.cc",
       ]
       deps = [
@@ skipping 13 matching lines @@
   }
 
   executable("run_testserver") {
     testonly = true
     sources = [
       "tools/testserver/run_testserver.cc",
     ]
     deps = [
       ":net",  # TODO(brettw) bug 363749: this shouldn't be necessary. It's not
                # in the GYP build, and can be removed when the bug is fixed.
-
       ":test_support",
       "//base",
       "//base/test:test_support",
       "//testing/gtest",
     ]
   }
 
   executable("stress_cache") {
     testonly = true
     sources = [
@@ skipping 88 matching lines @@
       "tools/flip_server/http_interface_test.cc",
       "tools/flip_server/mem_cache_test.cc",
       "tools/flip_server/run_all_tests.cc",
       "tools/flip_server/spdy_interface_test.cc",
     ]
     deps = [
       ":balsa",
       ":flip_in_mem_edsm_server_base",
       ":net",
       ":test_support",
+      "//testing/gmock",
       "//testing/gtest",
-      "//testing/gmock",
       "//third_party/boringssl",
     ]
   }
 
   executable("flip_in_mem_edsm_server") {
     testonly = true
     sources = [
       "tools/flip_server/flip_in_mem_edsm_server.cc",
     ]
     deps = [
@@ skipping 34 matching lines @@
       "//url",
     ]
   }
 
   executable("epoll_quic_client") {
     sources = [
       "tools/quic/quic_client_bin.cc",
     ]
     deps = [
       ":balsa",
+      ":epoll_quic_tools",
       ":epoll_server",
-      ":epoll_quic_tools",
       ":net",
       ":simple_quic_tools",
       "//base",
       "//third_party/boringssl",
     ]
   }
 
   executable("epoll_quic_server") {
     sources = [
       "tools/quic/quic_server_bin.cc",
     ]
     deps = [
       ":balsa",
+      ":epoll_quic_tools",
       ":epoll_server",
-      ":epoll_quic_tools",
       ":net",
       ":simple_quic_tools",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }
 
 if (is_android) {
   generate_jni("net_jni_headers") {
@@ skipping 123 matching lines @@
       "//url",
     ]
 
     if (is_desktop_linux) {
       deps += [ ":epoll_quic_tools" ]
     }
     if (is_linux) {
       sources += gypi_values.net_linux_test_sources
       deps += [
         ":balsa",
+        ":epoll_quic_tools",
         ":epoll_server",
         ":flip_in_mem_edsm_server_base",
-        ":epoll_quic_tools",
       ]
     }
 
     if (is_mac || is_ios) {
       sources += gypi_values.net_base_test_mac_ios_sources
     }
 
     if (is_chromeos) {
       sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
     }
@@ skipping 247 matching lines @@
     "base/mime_sniffer_perftest.cc",
     "cookies/cookie_monster_perftest.cc",
     "disk_cache/blockfile/disk_cache_perftest.cc",
     "proxy/proxy_resolver_perftest.cc",
     "udp/udp_socket_perftest.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",
     "//base:i18n",
     "//base/test:test_support_perf",
     "//testing/gtest",
     "//url",
-    ":net",
-    ":test_support",
   ]
 
   if (enable_websockets) {
     sources += [ "websockets/websocket_frame_perftest.cc" ]
   }
 
   if (use_v8_in_net) {
     deps += [ ":net_with_v8" ]
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 
   if (is_win && icu_use_data_file) {
     # This is needed to trigger the dll copy step on windows.
     # TODO(mark): Specifying this here shouldn't be necessary.
     deps += [ "//third_party/icu:icudata" ]
   }
 }