Update from https://crrev.com/316786

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 95 matching lines @@
 
   if (use_kerberos) {
     defines += [ "USE_KERBEROS" ]
     if (is_android) {
       include_dirs += [ "/usr/include/kerberosV" ]
     }
   } else {
     sources -= [
       "http/http_auth_gssapi_posix.cc",
       "http/http_auth_gssapi_posix.h",
+      "http/http_auth_handler_negotiate.cc",
       "http/http_auth_handler_negotiate.h",
-      "http/http_auth_handler_negotiate.cc",
     ]
   }
 
   if (is_posix) {
     if (posix_avoid_mmap) {
       sources -= [ "disk_cache/blockfile/mapped_file_posix.cc" ]
     } else {
       sources -= [ "disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc" ]
     }
   }
 
   if (disable_file_support) {
     sources -= [
       "base/directory_lister.cc",
       "base/directory_lister.h",
+      "url_request/file_protocol_handler.cc",
+      "url_request/file_protocol_handler.h",
       "url_request/url_request_file_dir_job.cc",
       "url_request/url_request_file_dir_job.h",
       "url_request/url_request_file_job.cc",
       "url_request/url_request_file_job.h",
-      "url_request/file_protocol_handler.cc",
-      "url_request/file_protocol_handler.h",
     ]
   }
 
   if (disable_ftp_support) {
     sources -= [
       "ftp/ftp_auth_cache.cc",
       "ftp/ftp_auth_cache.h",
       "ftp/ftp_ctrl_response_buffer.cc",
       "ftp/ftp_ctrl_response_buffer.h",
       "ftp/ftp_directory_listing_parser.cc",
@@ skipping 242 matching lines @@
       "websockets/websocket_errors.cc",
       "websockets/websocket_errors.h",
       "websockets/websocket_extension.cc",
       "websockets/websocket_extension.h",
       "websockets/websocket_extension_parser.cc",
       "websockets/websocket_extension_parser.h",
       "websockets/websocket_frame.cc",
       "websockets/websocket_frame.h",
       "websockets/websocket_frame_parser.cc",
       "websockets/websocket_frame_parser.h",
+      "websockets/websocket_handshake_challenge.cc",
+      "websockets/websocket_handshake_challenge.h",
       "websockets/websocket_handshake_constants.cc",
       "websockets/websocket_handshake_constants.h",
-      "websockets/websocket_handshake_challenge.cc",
-      "websockets/websocket_handshake_challenge.h",
       "websockets/websocket_handshake_request_info.cc",
       "websockets/websocket_handshake_request_info.h",
       "websockets/websocket_handshake_response_info.cc",
       "websockets/websocket_handshake_response_info.h",
       "websockets/websocket_handshake_stream_base.h",
       "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",
@@ skipping 55 matching lines @@
       "base/net_util_mac.cc",
       "base/net_util_mac.h",
       "base/network_change_notifier_mac.cc",
       "base/network_config_watcher_mac.cc",
       "base/platform_mime_util_mac.mm",
       "cert/cert_verify_proc_nss.cc",
       "cert/cert_verify_proc_nss.h",
       "cert/test_root_certs_nss.cc",
       "cert/x509_util_nss.cc",
       "cert/x509_util_nss.h",
+      "ocsp/nss_ocsp.cc",
+      "ocsp/nss_ocsp.h",
       "proxy/proxy_resolver_mac.cc",
       "proxy/proxy_server_mac.cc",
-      "ocsp/nss_ocsp.cc",
-      "ocsp/nss_ocsp.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     sources -= [ "disk_cache/blockfile/file_posix.cc" ]
     libs = [
       "CFNetwork.framework",
       "MobileCoreServices.framework",
       "Security.framework",
       "SystemConfiguration.framework",
       "resolv",
     ]
   }
 
   if (is_ios || is_mac) {
     sources += gypi_values.net_base_mac_ios_sources
   }
 
   if (is_android) {
     # Add some Linux sources that were excluded by the filter, but which
     # are needed.
     set_sources_assignment_filter([])
     sources += [
-      "base/platform_mime_util_linux.cc",
       "base/address_tracker_linux.cc",
       "base/address_tracker_linux.h",
       "base/net_util_linux.cc",
       "base/net_util_linux.h",
+      "base/platform_mime_util_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     if (!is_android_webview_build) {
       deps += [ ":net_jni_headers" ]
     }
   }
 
   if (use_icu_alternatives_on_android) {
     deps -= [
@@ skipping 65 matching lines @@
   sources = [
     "tools/dump_cache/cache_dumper.cc",
     "tools/dump_cache/cache_dumper.h",
     "tools/dump_cache/dump_cache.cc",
     "tools/dump_cache/dump_files.cc",
     "tools/dump_cache/dump_files.h",
     "tools/dump_cache/simple_cache_dumper.cc",
     "tools/dump_cache/simple_cache_dumper.h",
     "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",
-    "tools/dump_cache/url_utilities.cc",
   ]
 
   configs += [ ":net_win_size_truncation" ]
 
   deps = [
     "//base",
     ":net",
     ":test_support",
   ]
 }
@@ skipping 55 matching lines @@
     "test/embedded_test_server/http_request.cc",
     "test/embedded_test_server/http_request.h",
     "test/embedded_test_server/http_response.cc",
     "test/embedded_test_server/http_response.h",
     "test/net_test_suite.cc",
     "test/net_test_suite.h",
     "test/python_utils.cc",
     "test/python_utils.h",
     "test/spawned_test_server/base_test_server.cc",
     "test/spawned_test_server/base_test_server.h",
+    "test/spawned_test_server/local_test_server.cc",
+    "test/spawned_test_server/local_test_server.h",
     "test/spawned_test_server/local_test_server_posix.cc",
     "test/spawned_test_server/local_test_server_win.cc",
-    "test/spawned_test_server/local_test_server.cc",
-    "test/spawned_test_server/local_test_server.h",
     "test/spawned_test_server/remote_test_server.cc",
     "test/spawned_test_server/remote_test_server.h",
     "test/spawned_test_server/spawned_test_server.h",
     "test/spawned_test_server/spawner_communicator.cc",
     "test/spawned_test_server/spawner_communicator.h",
     "test/url_request/url_request_failed_job.cc",
     "test/url_request/url_request_failed_job.h",
     "test/url_request/url_request_mock_data_job.cc",
     "test/url_request/url_request_mock_data_job.h",
     "test/url_request/url_request_mock_http_job.cc",
@@ skipping 100 matching lines @@
     ]
     deps = [
       "//base",
       "//gin",
       "//url",
       "//v8",
     ]
   }
 }
 
+if (use_v8_in_net && !is_android) {
+  source_set("net_browser_services") {
+    sources = [
+      "dns/mojo_host_resolver_impl.cc",
+      "dns/mojo_host_resolver_impl.h",
+    ]
+
+    public_deps = [
+      ":mojo_type_converters",
+      ":net",
+      "//net/interfaces",
+      "//mojo/public/cpp/bindings",
+    ]
+  }
+
+  source_set("mojo_type_converters") {
+    sources = [
+      "dns/mojo_type_converters.cc",
+      "dns/mojo_type_converters.h",
+    ]
+
+    public_deps = [
+      ":net",
+      "//net/interfaces",
+      "//mojo/public/cpp/bindings",
+    ]
+  }
+}
+
 if (!is_ios && !is_android) {
   executable("crash_cache") {
     testonly = true
     sources = [
       "tools/crash_cache/crash_cache.cc",
     ]
     configs += [ ":net_win_size_truncation" ]
     deps = [
       ":net",
       ":test_support",
@@ skipping 124 matching lines @@
       ":net",
       "//base",
     ]
   }
 
   static_library("flip_in_mem_edsm_server_base") {
     testonly = true
     sources = [
       "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",
-      "tools/dump_cache/url_utilities.cc",
+      "tools/flip_server/acceptor_thread.cc",
       "tools/flip_server/acceptor_thread.h",
-      "tools/flip_server/acceptor_thread.cc",
+      "tools/flip_server/constants.h",
       "tools/flip_server/create_listener.cc",
       "tools/flip_server/create_listener.h",
-      "tools/flip_server/constants.h",
       "tools/flip_server/flip_config.cc",
       "tools/flip_server/flip_config.h",
       "tools/flip_server/http_interface.cc",
       "tools/flip_server/http_interface.h",
       "tools/flip_server/loadtime_measurement.h",
+      "tools/flip_server/mem_cache.cc",
       "tools/flip_server/mem_cache.h",
-      "tools/flip_server/mem_cache.cc",
       "tools/flip_server/output_ordering.cc",
       "tools/flip_server/output_ordering.h",
       "tools/flip_server/ring_buffer.cc",
       "tools/flip_server/ring_buffer.h",
       "tools/flip_server/sm_connection.cc",
       "tools/flip_server/sm_connection.h",
       "tools/flip_server/sm_interface.h",
+      "tools/flip_server/spdy_interface.cc",
+      "tools/flip_server/spdy_interface.h",
       "tools/flip_server/spdy_ssl.cc",
       "tools/flip_server/spdy_ssl.h",
-      "tools/flip_server/spdy_interface.cc",
-      "tools/flip_server/spdy_interface.h",
       "tools/flip_server/spdy_util.cc",
       "tools/flip_server/spdy_util.h",
       "tools/flip_server/streamer_interface.cc",
       "tools/flip_server/streamer_interface.h",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
@@ skipping 34 matching lines @@
   }
 
   source_set("quic_base") {
     sources = [
       "tools/quic/quic_client.cc",
       "tools/quic/quic_client.h",
       "tools/quic/quic_client_session.cc",
       "tools/quic/quic_client_session.h",
       "tools/quic/quic_default_packet_writer.cc",
       "tools/quic/quic_default_packet_writer.h",
+      "tools/quic/quic_dispatcher.cc",
       "tools/quic/quic_dispatcher.h",
-      "tools/quic/quic_dispatcher.cc",
       "tools/quic/quic_epoll_clock.cc",
       "tools/quic/quic_epoll_clock.h",
       "tools/quic/quic_epoll_connection_helper.cc",
       "tools/quic/quic_epoll_connection_helper.h",
       "tools/quic/quic_in_memory_cache.cc",
       "tools/quic/quic_in_memory_cache.h",
       "tools/quic/quic_packet_writer_wrapper.cc",
       "tools/quic/quic_packet_writer_wrapper.h",
       "tools/quic/quic_per_connection_packet_writer.cc",
       "tools/quic/quic_per_connection_packet_writer.h",
       "tools/quic/quic_server.cc",
       "tools/quic/quic_server.h",
       "tools/quic/quic_server_session.cc",
       "tools/quic/quic_server_session.h",
       "tools/quic/quic_socket_utils.cc",
       "tools/quic/quic_socket_utils.h",
       "tools/quic/quic_spdy_client_stream.cc",
       "tools/quic/quic_spdy_client_stream.h",
       "tools/quic/quic_spdy_server_stream.cc",
       "tools/quic/quic_spdy_server_stream.h",
+      "tools/quic/quic_time_wait_list_manager.cc",
       "tools/quic/quic_time_wait_list_manager.h",
-      "tools/quic/quic_time_wait_list_manager.cc",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//crypto",
       "//third_party/boringssl",
       "//url",
@@ skipping 207 matching lines @@
       sources -= [
         "server/http_connection_unittest.cc",
         "server/http_server_response_info_unittest.cc",
         "server/http_server_unittest.cc",
         "server/web_socket_encoder_unittest.cc",
         "websockets/websocket_basic_stream_test.cc",
         "websockets/websocket_channel_test.cc",
         "websockets/websocket_deflate_predictor_impl_test.cc",
         "websockets/websocket_deflate_stream_test.cc",
         "websockets/websocket_deflater_test.cc",
+        "websockets/websocket_end_to_end_test.cc",
         "websockets/websocket_errors_test.cc",
-        "websockets/websocket_end_to_end_test.cc",
         "websockets/websocket_extension_parser_test.cc",
         "websockets/websocket_frame_parser_test.cc",
         "websockets/websocket_frame_test.cc",
         "websockets/websocket_handshake_challenge_test.cc",
         "websockets/websocket_handshake_stream_create_helper_test.cc",
         "websockets/websocket_inflater_test.cc",
         "websockets/websocket_stream_test.cc",
         "websockets/websocket_test_util.cc",
         "websockets/websocket_test_util.h",
       ]
@@ skipping 31 matching lines @@
       ]
     }
 
     # Always need use_v8_in_net to be 1 to run on Android, so just remove
     # net_unittest's dependency on v8 when using icu alternatives instead of
     # setting use_v8_in_net to 0.
     if (use_v8_in_net && !use_icu_alternatives_on_android) {
       deps += [ ":net_with_v8" ]
     } else {
       sources -= [
+        "proxy/proxy_resolver_v8_tracing_unittest.cc",
         "proxy/proxy_resolver_v8_unittest.cc",
-        "proxy/proxy_resolver_v8_tracing_unittest.cc",
       ]
     }
 
+    if (use_v8_in_net && !is_android) {
+      deps += [
+        ":net_browser_services",
+        "//mojo/environment:chromium",
+        "//mojo/edk/system",
+      ]
+    } else {
+      sources -= [ "dns/mojo_host_resolver_impl_unittest.cc" ]
+    }
+
     if (!enable_mdns) {
       sources -= [
         "dns/mdns_cache_unittest.cc",
         "dns/mdns_client_unittest.cc",
         "dns/record_parsed_unittest.cc",
         "dns/record_rdata_unittest.cc",
       ]
     }
 
     if (is_ios) {
@@ skipping 75 matching lines @@
       "quic/quic_server_bin.cc",
     ]
     deps = [
       ":quic_tools",
       ":net",
       "//base",
       "//third_party/boringssl",
     ]
   }
 }  # !is_android && !is_win && !is_mac