Update from https://crrev.com/316786

net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 126 matching lines @@
             }, { # linux_link_kerberos==0
               'defines': [
                 'DLOPEN_KERBEROS',
               ],
             }],
           ],
         }, { # use_kerberos == 0
           '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',
           ],
         }],
         ['posix_avoid_mmap==1', {
           'defines': [
             'POSIX_AVOID_MMAP',
           ],
           'direct_dependent_settings': {
             'defines': [
               'POSIX_AVOID_MMAP',
             ],
           },
           'sources!': [
             'disk_cache/blockfile/mapped_file_posix.cc',
           ],
         }, { # else
           'sources!': [
             'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
           ],
         }],
         ['disable_file_support==1', {
           # TODO(mmenke):  Should probably get rid of the dependency on
           # net_resources in this case (It's used in net_util, to format
           # directory listings.  Also used outside of net/).
           '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',
           ],
         }],
         ['disable_ftp_support==1', {
           'sources/': [
             ['exclude', '^ftp/'],
           ],
           'sources!': [
             'url_request/ftp_protocol_handler.cc',
             'url_request/ftp_protocol_handler.h',
             'url_request/url_request_ftp_job.cc',
@@ skipping 22 matching lines @@
               'cert/cert_verify_proc_nss.h',
               'cert/ct_log_verifier_nss.cc',
               'cert/ct_objects_extractor_nss.cc',
               'cert/jwk_serializer_nss.cc',
               'cert/nss_cert_database.cc',
               'cert/nss_cert_database.h',
               'cert/nss_cert_database_chromeos.cc',
               'cert/nss_cert_database_chromeos.h',
               'cert/nss_profile_filter_chromeos.cc',
               'cert/nss_profile_filter_chromeos.h',
+              'cert/scoped_nss_types.h',
               'cert/sha256_legacy_support_nss_win.cc',
-              'cert/scoped_nss_types.h',
               'cert/test_root_certs_nss.cc',
               'cert/x509_certificate_nss.cc',
               'cert/x509_util_nss.cc',
               'cert/x509_util_nss.h',
               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'quic/crypto/aead_base_decrypter_nss.cc',
               'quic/crypto/aead_base_encrypter_nss.cc',
               'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
               'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
@@ skipping 37 matching lines @@
               'quic/crypto/channel_id_openssl.cc',
               'quic/crypto/p256_key_exchange_openssl.cc',
               'quic/crypto/scoped_evp_aead_ctx.cc',
               'quic/crypto/scoped_evp_aead_ctx.h',
               'socket/ssl_client_socket_openssl.cc',
               'socket/ssl_client_socket_openssl.h',
               'socket/ssl_server_socket_openssl.cc',
               'socket/ssl_server_socket_openssl.h',
               'socket/ssl_session_cache_openssl.cc',
               'socket/ssl_session_cache_openssl.h',
+              'ssl/openssl_platform_key.h',
               'ssl/openssl_platform_key_mac.cc',
               'ssl/openssl_platform_key_win.cc',
-              'ssl/openssl_platform_key.h',
               'ssl/openssl_ssl_util.cc',
               'ssl/openssl_ssl_util.h',
             ],
             'conditions': [
               # Pull in the bundled or system NSS as appropriate.
               [ 'desktop_linux == 1 or chromeos == 1', {
                 'dependencies': [
                   '../build/linux/system.gyp:ssl',
                 ],
               }, {
@@ skipping 66 matching lines @@
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
         ],
         [ 'use_nss != 1', {
             'sources!': [
               'cert/cert_verify_proc_nss.cc',
               'cert/cert_verify_proc_nss.h',
+              'ssl/client_cert_store_chromeos.cc',
+              'ssl/client_cert_store_chromeos.h',
               'ssl/client_cert_store_nss.cc',
               'ssl/client_cert_store_nss.h',
-              'ssl/client_cert_store_chromeos.cc',
-              'ssl/client_cert_store_chromeos.h',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^websockets/'],
             ],
         }],
         [ 'enable_mdns != 1', {
             'sources!' : [
               'dns/mdns_cache.cc',
@@ skipping 189 matching lines @@
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
           ],
           'dependencies': [
             'net_javatests',
             'net_test_jni_headers',
           ],
         }],
         [ 'use_nss != 1', {
           'sources!': [
+            'ssl/client_cert_store_chromeos_unittest.cc',
             'ssl/client_cert_store_nss_unittest.cc',
-            'ssl/client_cert_store_chromeos_unittest.cc',
           ],
         }],
         [ 'use_openssl == 1', {
           # Avoid compiling/linking with the system library.
           'dependencies': [
             '../third_party/boringssl/boringssl.gyp:boringssl',
           ],
         }, {  # use_openssl == 0
           'conditions': [
             [ 'desktop_linux == 1 or chromeos == 1', {
@@ skipping 39 matching lines @@
           'sources!': [
             'ocsp/nss_ocsp_unittest.cc',
           ],
         }],
         [ 'use_openssl==1', {
             # When building for OpenSSL, we need to exclude NSS specific tests
             # or functionality not supported by OpenSSL yet.
             # TODO(bulach): Add equivalent tests when the underlying
             #               functionality is ported to OpenSSL.
             'sources!': [
+              'cert/nss_cert_database_chromeos_unittest.cc',
               'cert/nss_cert_database_unittest.cc',
-              'cert/nss_cert_database_chromeos_unittest.cc',
               'cert/nss_profile_filter_chromeos_unittest.cc',
               'cert/x509_util_nss_unittest.cc',
               'quic/test_tools/crypto_test_utils_nss.cc',
             ],
           }, {  # else !use_openssl: remove the unneeded files and pull in NSS.
             'sources!': [
               'cert/x509_util_openssl_unittest.cc',
               'quic/test_tools/crypto_test_utils_openssl.cc',
               'socket/ssl_client_socket_openssl_unittest.cc',
               'socket/ssl_session_cache_openssl_unittest.cc',
@@ skipping 38 matching lines @@
         ],
         # Always need use_v8_in_net to be 1 to run gyp on Android, so just
         # remove net_unittest's dependency on v8 when using icu alternatives
         # instead of setting use_v8_in_net to 0.
         [ 'use_v8_in_net==1 and use_icu_alternatives_on_android==0', {
             'dependencies': [
               'net_with_v8',
             ],
           }, {  # else: !use_v8_in_net
             'sources!': [
+              'proxy/proxy_resolver_v8_tracing_unittest.cc',
               'proxy/proxy_resolver_v8_unittest.cc',
-              'proxy/proxy_resolver_v8_tracing_unittest.cc',
             ],
           },
         ],
+
+        [ 'use_v8_in_net==1 and OS != "android"', {
+            'dependencies': [
+              'net_with_v8',
+              'net_browser_services',
+              '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            ],
+          }, {  # else
+            'sources!': [
+              'dns/mojo_host_resolver_impl_unittest.cc',
+            ],
+          },
+        ],
 
         [ 'enable_mdns != 1', {
             'sources!' : [
               'dns/mdns_cache_unittest.cc',
               'dns/mdns_client_unittest.cc',
               'dns/mdns_query_unittest.cc',
               'dns/record_parsed_unittest.cc',
               'dns/record_rdata_unittest.cc',
             ],
         }],
@@ skipping 32 matching lines @@
             ],
             'sources!': [
               # TODO(droger): The following tests are disabled because the
               # implementation is missing or incomplete.
               # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
               'base/keygen_handler_unittest.cc',
               'disk_cache/backend_unittest.cc',
               'disk_cache/blockfile/block_files_unittest.cc',
               # Need to read input data files.
               'filter/gzip_filter_unittest.cc',
-              'socket/ssl_server_socket_unittest.cc',
-              'spdy/fuzzing/hpack_fuzz_util_test.cc',
               # Need TestServer.
               'proxy/proxy_script_fetcher_impl_unittest.cc',
               'socket/ssl_client_socket_unittest.cc',
+              'socket/ssl_server_socket_unittest.cc',
+              'spdy/fuzzing/hpack_fuzz_util_test.cc',
+              # Needs GetAppOutput().
+              'test/python_utils_unittest.cc',
               'url_request/url_fetcher_impl_unittest.cc',
               'url_request/url_request_context_builder_unittest.cc',
-              # Needs GetAppOutput().
-              'test/python_utils_unittest.cc',
 
               # The following tests are disabled because they don't apply to
               # iOS.
               # OS is not "linux" or "freebsd" or "openbsd".
               'socket/unix_domain_client_socket_posix_unittest.cc',
               'socket/unix_domain_listen_socket_posix_unittest.cc',
               'socket/unix_domain_server_socket_posix_unittest.cc',
 
               # See bug http://crbug.com/344533.
               'disk_cache/blockfile/index_table_v3_unittest.cc',
@@ skipping 166 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 159 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',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
       # This is a temporary target which will be merged into 'net' once the
       # dependency on balsa is eliminated and the classes are actually used.
       'target_name': 'quic_tools',
       'type': 'static_library',
       'dependencies': [
@@ skipping 59 matching lines @@
           'target_name': 'net_interfaces',
           'type': 'static_library',
           'sources': [
             'interfaces/host_resolver_service.mojom',
             'interfaces/proxy_resolver_service.mojom',
           ],
           'includes': [
             '../third_party/mojo/mojom_bindings_generator.gypi',
           ],
         },
+        {
+          # GN version: //net:net_browser_services
+          'target_name': 'net_browser_services',
+          'type': 'static_library',
+          'sources': [
+            'dns/mojo_host_resolver_impl.cc',
+            'dns/mojo_host_resolver_impl.h',
+          ],
+          'dependencies': [
+            'mojo_type_converters',
+            'net',
+            'net_interfaces',
+            '../mojo/mojo_base.gyp:mojo_environment_chromium',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+          ],
+        },
+        {
+          # GN version: //net:mojo_type_converters
+          'target_name': 'mojo_type_converters',
+          'type': 'static_library',
+          'sources': [
+            'dns/mojo_type_converters.cc',
+            'dns/mojo_type_converters.h',
+          ],
+          'dependencies': [
+            'net',
+            'net_interfaces',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+          ],
+        },
       ],
     }],
     ['OS != "ios" and OS != "android"', {
       'targets': [
         # iOS doesn't have the concept of simple executables, these targets
         # can't be compiled on the platform.
         {
           'target_name': 'crash_cache',
           'type': 'executable',
           'dependencies': [
@@ skipping 186 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/boringssl/boringssl.gyp:boringssl',
             'balsa',
             'epoll_server',
             'net',
           ],
           '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',
           ],
         },
         {
           'target_name': 'flip_in_mem_edsm_server_unittests',
           'type': 'executable',
           'dependencies': [
@@ skipping 39 matching lines @@
             'epoll_server',
             'net',
           ],
           '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',
           ],
         },
         {
           'target_name': 'quic_client',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
             'quic_base',
           ],
@@ skipping 221 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }