Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / net / net.gyp
index 3729a55..7b4b5d6 100644 (file)
@@ -7,13 +7,12 @@
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
-    'use_tracing_cache_backend%': 0,
     'conditions': [
-      ['chromeos==1 or OS=="android" or OS=="ios"', {
+      ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', {
         # Disable Kerberos on ChromeOS, Android and iOS, at least for now.
         # It needs configuration (krb5.conf and so on).
         'use_kerberos%': 0,
-      }, {  # chromeos == 0
+      }, {  # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios"
         'use_kerberos%': 1,
       }],
       ['OS=="android" and target_arch != "ia32"', {
   },
   'includes': [
     '../build/win_precompile.gypi',
+    'net.gypi',
   ],
   'targets': [
     {
+      'target_name': 'net_derived_sources',
+      'type': 'none',
+      'sources': [
+        'base/registry_controlled_domains/effective_tld_names.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest1.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest2.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest3.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest4.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest5.gperf',
+        'base/registry_controlled_domains/effective_tld_names_unittest6.gperf',
+      ],
+      'rules': [
+        {
+          'rule_name': 'dafsa',
+          'extension': 'gperf',
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-inc.cc',
+          ],
+          'inputs': [
+            'tools/tld_cleanup/make_dafsa.py',
+          ],
+          'action': [
+            'python',
+            'tools/tld_cleanup/make_dafsa.py',
+            '<(RULE_INPUT_PATH)',
+            '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-inc.cc',
+          ],
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)'
+        ],
+      },
+    },
+    {
       'target_name': 'net',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
+        '../base/base.gyp:base_prefs',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
+        'net_derived_sources',
         'net_resources',
       ],
       'sources': [
-        'android/cert_verify_result_android.h',
-        'android/cert_verify_result_android_list.h',
-        'android/gurl_utils.cc',
-        'android/gurl_utils.h',
-        'android/keystore.cc',
-        'android/keystore.h',
-        'android/keystore_openssl.cc',
-        'android/keystore_openssl.h',
-        'android/net_jni_registrar.cc',
-        'android/net_jni_registrar.h',
-        'android/network_change_notifier_android.cc',
-        'android/network_change_notifier_android.h',
-        'android/network_change_notifier_delegate_android.cc',
-        'android/network_change_notifier_delegate_android.h',
-        'android/network_change_notifier_factory_android.cc',
-        'android/network_change_notifier_factory_android.h',
-        'android/network_library.cc',
-        'android/network_library.h',
-        'base/address_family.h',
-        'base/address_list.cc',
-        'base/address_list.h',
-        'base/address_tracker_linux.cc',
-        'base/address_tracker_linux.h',
-        'base/auth.cc',
-        'base/auth.h',
-        'base/backoff_entry.cc',
-        'base/backoff_entry.h',
-        'base/bandwidth_metrics.cc',
-        'base/bandwidth_metrics.h',
-        'base/big_endian.cc',
-        'base/big_endian.h',
-        'base/cache_type.h',
-        'base/completion_callback.h',
-        'base/connection_type_histograms.cc',
-        'base/connection_type_histograms.h',
-        'base/crypto_module.h',
-        'base/crypto_module_nss.cc',
-        'base/crypto_module_openssl.cc',
-        'base/data_url.cc',
-        'base/data_url.h',
-        'base/directory_lister.cc',
-        'base/directory_lister.h',
-        'base/dns_reloader.cc',
-        'base/dns_reloader.h',
-        'base/dns_util.cc',
-        'base/dns_util.h',
-        'base/escape.cc',
-        'base/escape.h',
-        'base/expiring_cache.h',
-        'base/file_stream.cc',
-        'base/file_stream.h',
-        'base/file_stream_context.cc',
-        'base/file_stream_context.h',
-        'base/file_stream_context_posix.cc',
-        'base/file_stream_context_win.cc',
-        'base/file_stream_metrics.cc',
-        'base/file_stream_metrics.h',
-        'base/file_stream_metrics_posix.cc',
-        'base/file_stream_metrics_win.cc',
-        'base/file_stream_net_log_parameters.cc',
-        'base/file_stream_net_log_parameters.h',
-        'base/file_stream_whence.h',
-        'base/filter.cc',
-        'base/filter.h',
-        'base/int128.cc',
-        'base/int128.h',
-        'base/gzip_filter.cc',
-        'base/gzip_filter.h',
-        'base/gzip_header.cc',
-        'base/gzip_header.h',
-        'base/hash_value.cc',
-        'base/hash_value.h',
-        'base/host_mapping_rules.cc',
-        'base/host_mapping_rules.h',
-        'base/host_port_pair.cc',
-        'base/host_port_pair.h',
-        'base/io_buffer.cc',
-        'base/io_buffer.h',
-        'base/iovec.h',
-        'base/ip_endpoint.cc',
-        'base/ip_endpoint.h',
-        'base/keygen_handler.cc',
-        'base/keygen_handler.h',
-        'base/keygen_handler_mac.cc',
-        'base/keygen_handler_nss.cc',
-        'base/keygen_handler_openssl.cc',
-        'base/keygen_handler_win.cc',
-        'base/linked_hash_map.h',
-        'base/load_flags.h',
-        'base/load_flags_list.h',
-        'base/load_states.h',
-        'base/load_states_list.h',
-        'base/load_timing_info.cc',
-        'base/load_timing_info.h',
-        'base/mime_sniffer.cc',
-        'base/mime_sniffer.h',
-        'base/mime_util.cc',
-        'base/mime_util.h',
-        'base/net_error_list.h',
-        'base/net_errors.cc',
-        'base/net_errors.h',
-        'base/net_errors_posix.cc',
-        'base/net_errors_win.cc',
-        'base/net_export.h',
-        'base/net_log.cc',
-        'base/net_log.h',
-        'base/net_log_logger.cc',
-        'base/net_log_logger.h',
-        'base/net_log_event_type_list.h',
-        'base/net_log_source_type_list.h',
-        'base/net_module.cc',
-        'base/net_module.h',
-        'base/net_util.cc',
-        'base/net_util.h',
-        'base/net_util_posix.cc',
-        'base/net_util_win.cc',
-        'base/network_change_notifier.cc',
-        'base/network_change_notifier.h',
-        'base/network_change_notifier_factory.h',
-        'base/network_change_notifier_linux.cc',
-        'base/network_change_notifier_linux.h',
-        'base/network_change_notifier_mac.cc',
-        'base/network_change_notifier_mac.h',
-        'base/network_change_notifier_win.cc',
-        'base/network_change_notifier_win.h',
-        'base/network_config_watcher_mac.cc',
-        'base/network_config_watcher_mac.h',
-        'base/network_delegate.cc',
-        'base/network_delegate.h',
-        'base/network_time_notifier.cc',
-        'base/network_time_notifier.h',
-        'base/nss_memio.c',
-        'base/nss_memio.h',
-        'base/openssl_private_key_store.h',
-        'base/openssl_private_key_store_android.cc',
-        'base/openssl_private_key_store_memory.cc',
-        'base/platform_mime_util.h',
-        # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
-        'base/platform_mime_util_linux.cc',
-        'base/platform_mime_util_mac.mm',
-        'base/platform_mime_util_win.cc',
-        'base/prioritized_dispatcher.cc',
-        'base/prioritized_dispatcher.h',
-        'base/priority_queue.h',
-        'base/rand_callback.h',
-        'base/registry_controlled_domains/registry_controlled_domain.cc',
-        'base/registry_controlled_domains/registry_controlled_domain.h',
-        'base/request_priority.cc',
-        'base/request_priority.h',
-        'base/sdch_filter.cc',
-        'base/sdch_filter.h',
-        'base/sdch_manager.cc',
-        'base/sdch_manager.h',
-        'base/static_cookie_policy.cc',
-        'base/static_cookie_policy.h',
-        'base/sys_addrinfo.h',
-        'base/test_data_stream.cc',
-        'base/test_data_stream.h',
-        'base/upload_bytes_element_reader.cc',
-        'base/upload_bytes_element_reader.h',
-        'base/upload_data.cc',
-        'base/upload_data.h',
-        'base/upload_data_stream.cc',
-        'base/upload_data_stream.h',
-        'base/upload_element.cc',
-        'base/upload_element.h',
-        'base/upload_element_reader.cc',
-        'base/upload_element_reader.h',
-        'base/upload_file_element_reader.cc',
-        'base/upload_file_element_reader.h',
-        'base/upload_progress.h',
-        'base/url_util.cc',
-        'base/url_util.h',
-        'base/winsock_init.cc',
-        'base/winsock_init.h',
-        'base/winsock_util.cc',
-        'base/winsock_util.h',
-        'base/zap.cc',
-        'base/zap.h',
-        'cert/asn1_util.cc',
-        'cert/asn1_util.h',
-        'cert/cert_database.cc',
-        'cert/cert_database.h',
-        'cert/cert_database_android.cc',
-        'cert/cert_database_ios.cc',
-        'cert/cert_database_mac.cc',
-        'cert/cert_database_nss.cc',
-        'cert/cert_database_openssl.cc',
-        'cert/cert_database_win.cc',
-        'cert/cert_status_flags.cc',
-        'cert/cert_status_flags.h',
-        'cert/cert_trust_anchor_provider.h',
-        'cert/cert_verifier.cc',
-        'cert/cert_verifier.h',
-        'cert/cert_verify_proc.cc',
-        'cert/cert_verify_proc.h',
-        'cert/cert_verify_proc_android.cc',
-        'cert/cert_verify_proc_android.h',
-        'cert/cert_verify_proc_mac.cc',
-        'cert/cert_verify_proc_mac.h',
-        'cert/cert_verify_proc_nss.cc',
-        'cert/cert_verify_proc_nss.h',
-        'cert/cert_verify_proc_openssl.cc',
-        'cert/cert_verify_proc_openssl.h',
-        'cert/cert_verify_proc_win.cc',
-        'cert/cert_verify_proc_win.h',
-        'cert/cert_verify_result.cc',
-        'cert/cert_verify_result.h',
-        'cert/crl_set.cc',
-        'cert/crl_set.h',
-        'cert/ct_serialization.cc',
-        'cert/ct_serialization.h',
-        'cert/ev_root_ca_metadata.cc',
-        'cert/ev_root_ca_metadata.h',
-        'cert/jwk_serializer_nss.cc',
-        'cert/jwk_serializer_openssl.cc',
-        'cert/jwk_serializer.h',
-        'cert/multi_threaded_cert_verifier.cc',
-        'cert/multi_threaded_cert_verifier.h',
-        'cert/nss_cert_database.cc',
-        'cert/nss_cert_database.h',
-        'cert/pem_tokenizer.cc',
-        'cert/pem_tokenizer.h',
-        'cert/signed_certificate_timestamp.cc',
-        'cert/signed_certificate_timestamp.h',
-        'cert/single_request_cert_verifier.cc',
-        'cert/single_request_cert_verifier.h',
-        'cert/test_root_certs.cc',
-        'cert/test_root_certs.h',
-        'cert/test_root_certs_android.cc',
-        'cert/test_root_certs_mac.cc',
-        'cert/test_root_certs_nss.cc',
-        'cert/test_root_certs_openssl.cc',
-        'cert/test_root_certs_win.cc',
-        'cert/x509_cert_types.cc',
-        'cert/x509_cert_types.h',
-        'cert/x509_cert_types_mac.cc',
-        'cert/x509_cert_types_win.cc',
-        'cert/x509_certificate.cc',
-        'cert/x509_certificate.h',
-        'cert/x509_certificate_ios.cc',
-        'cert/x509_certificate_mac.cc',
-        'cert/x509_certificate_net_log_param.cc',
-        'cert/x509_certificate_net_log_param.h',
-        'cert/x509_certificate_nss.cc',
-        'cert/x509_certificate_openssl.cc',
-        'cert/x509_certificate_win.cc',
-        'cert/x509_util.cc',
-        'cert/x509_util.h',
-        'cert/x509_util_android.cc',
-        'cert/x509_util_android.h',
-        'cert/x509_util_ios.cc',
-        'cert/x509_util_ios.h',
-        'cert/x509_util_mac.cc',
-        'cert/x509_util_mac.h',
-        'cert/x509_util_nss.cc',
-        'cert/x509_util_nss.h',
-        'cert/x509_util_openssl.cc',
-        'cert/x509_util_openssl.h',
-        'cookies/canonical_cookie.cc',
-        'cookies/canonical_cookie.h',
-        'cookies/cookie_constants.cc',
-        'cookies/cookie_constants.h',
-        'cookies/cookie_monster.cc',
-        'cookies/cookie_monster.h',
-        'cookies/cookie_options.h',
-        'cookies/cookie_store.cc',
-        'cookies/cookie_store.h',
-        'cookies/cookie_util.cc',
-        'cookies/cookie_util.h',
-        'cookies/parsed_cookie.cc',
-        'cookies/parsed_cookie.h',
-        'disk_cache/addr.cc',
-        'disk_cache/addr.h',
-        'disk_cache/backend_impl.cc',
-        'disk_cache/backend_impl.h',
-        'disk_cache/bitmap.cc',
-        'disk_cache/bitmap.h',
-        'disk_cache/block_files.cc',
-        'disk_cache/block_files.h',
-        'disk_cache/cache_creator.cc',
-        'disk_cache/cache_util.h',
-        'disk_cache/cache_util.cc',
-        'disk_cache/cache_util_posix.cc',
-        'disk_cache/cache_util_win.cc',
-        'disk_cache/disk_cache.h',
-        'disk_cache/disk_format.cc',
-        'disk_cache/disk_format.h',
-        'disk_cache/disk_format_base.h',
-        'disk_cache/entry_impl.cc',
-        'disk_cache/entry_impl.h',
-        'disk_cache/errors.h',
-        'disk_cache/eviction.cc',
-        'disk_cache/eviction.h',
-        'disk_cache/experiments.h',
-        'disk_cache/file.cc',
-        'disk_cache/file.h',
-        'disk_cache/file_block.h',
-        'disk_cache/file_lock.cc',
-        'disk_cache/file_lock.h',
-        'disk_cache/file_posix.cc',
-        'disk_cache/file_win.cc',
-        'disk_cache/histogram_macros.h',
-        'disk_cache/in_flight_backend_io.cc',
-        'disk_cache/in_flight_backend_io.h',
-        'disk_cache/in_flight_io.cc',
-        'disk_cache/in_flight_io.h',
-        'disk_cache/mapped_file.cc',
-        'disk_cache/mapped_file.h',
-        'disk_cache/mapped_file_posix.cc',
-        'disk_cache/mapped_file_avoid_mmap_posix.cc',
-        'disk_cache/mapped_file_win.cc',
-        'disk_cache/mem_backend_impl.cc',
-        'disk_cache/mem_backend_impl.h',
-        'disk_cache/mem_entry_impl.cc',
-        'disk_cache/mem_entry_impl.h',
-        'disk_cache/mem_rankings.cc',
-        'disk_cache/mem_rankings.h',
-        'disk_cache/net_log_parameters.cc',
-        'disk_cache/net_log_parameters.h',
-        'disk_cache/rankings.cc',
-        'disk_cache/rankings.h',
-        'disk_cache/sparse_control.cc',
-        'disk_cache/sparse_control.h',
-        'disk_cache/stats.cc',
-        'disk_cache/stats.h',
-        'disk_cache/stats_histogram.cc',
-        'disk_cache/stats_histogram.h',
-        'disk_cache/storage_block-inl.h',
-        'disk_cache/storage_block.h',
-        'disk_cache/stress_support.h',
-        'disk_cache/trace.cc',
-        'disk_cache/trace.h',
-        'disk_cache/tracing_cache_backend.cc',
-        'disk_cache/tracing_cache_backend.h',
-        'disk_cache/simple/simple_backend_impl.cc',
-        'disk_cache/simple/simple_backend_impl.h',
-        'disk_cache/simple/simple_backend_version.h',
-        'disk_cache/simple/simple_entry_format.cc',
-        'disk_cache/simple/simple_entry_format.h',
-        'disk_cache/simple/simple_entry_format_history.h',
-        'disk_cache/simple/simple_entry_impl.cc',
-        'disk_cache/simple/simple_entry_impl.h',
-        'disk_cache/simple/simple_entry_operation.cc',
-        'disk_cache/simple/simple_entry_operation.h',
-        'disk_cache/simple/simple_histogram_macros.h' ,
-        'disk_cache/simple/simple_index.cc',
-        'disk_cache/simple/simple_index.h',
-        'disk_cache/simple/simple_index_delegate.h',
-        'disk_cache/simple/simple_index_file.cc',
-        'disk_cache/simple/simple_index_file.h',
-        'disk_cache/simple/simple_index_file_posix.cc',
-        'disk_cache/simple/simple_index_file_win.cc',
-        'disk_cache/simple/simple_net_log_parameters.cc',
-        'disk_cache/simple/simple_net_log_parameters.h',
-        'disk_cache/simple/simple_synchronous_entry.cc',
-        'disk_cache/simple/simple_synchronous_entry.h',
-        'disk_cache/simple/simple_util.cc',
-        'disk_cache/simple/simple_util.h',
-        'disk_cache/simple/simple_version_upgrade.cc',
-        'disk_cache/simple/simple_version_upgrade.h',
-        'disk_cache/flash/flash_entry_impl.cc',
-        'disk_cache/flash/flash_entry_impl.h',
-        'disk_cache/flash/format.h',
-        'disk_cache/flash/internal_entry.cc',
-        'disk_cache/flash/internal_entry.h',
-        'disk_cache/flash/log_store.cc',
-        'disk_cache/flash/log_store.h',
-        'disk_cache/flash/log_store_entry.cc',
-        'disk_cache/flash/log_store_entry.h',
-        'disk_cache/flash/segment.cc',
-        'disk_cache/flash/segment.h',
-        'disk_cache/flash/storage.cc',
-        'disk_cache/flash/storage.h',
-        'disk_cache/v3/block_bitmaps.cc',
-        'disk_cache/v3/block_bitmaps.h',
-        'disk_cache/v3/disk_format_v3.h',
-        'dns/address_sorter.h',
-        'dns/address_sorter_posix.cc',
-        'dns/address_sorter_posix.h',
-        'dns/address_sorter_win.cc',
-        'dns/dns_client.cc',
-        'dns/dns_client.h',
-        'dns/dns_config_service.cc',
-        'dns/dns_config_service.h',
-        'dns/dns_config_service_posix.cc',
-        'dns/dns_config_service_posix.h',
-        'dns/dns_config_service_win.cc',
-        'dns/dns_config_service_win.h',
-        'dns/dns_hosts.cc',
-        'dns/dns_hosts.h',
-        'dns/dns_protocol.h',
-        'dns/dns_query.cc',
-        'dns/dns_query.h',
-        'dns/dns_response.cc',
-        'dns/dns_response.h',
-        'dns/dns_session.cc',
-        'dns/dns_session.h',
-        'dns/dns_socket_pool.cc',
-        'dns/dns_socket_pool.h',
-        'dns/dns_transaction.cc',
-        'dns/dns_transaction.h',
-        'dns/host_cache.cc',
-        'dns/host_cache.h',
-        'dns/host_resolver.cc',
-        'dns/host_resolver.h',
-        'dns/host_resolver_impl.cc',
-        'dns/host_resolver_impl.h',
-        'dns/host_resolver_proc.cc',
-        'dns/host_resolver_proc.h',
-        'dns/mapped_host_resolver.cc',
-        'dns/mapped_host_resolver.h',
-        '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/notify_watcher_mac.cc',
-        'dns/notify_watcher_mac.h',
-        'dns/record_parsed.cc',
-        'dns/record_parsed.h',
-        'dns/record_rdata.cc',
-        'dns/record_rdata.h',
-        'dns/serial_worker.cc',
-        'dns/serial_worker.h',
-        'dns/single_request_host_resolver.cc',
-        'dns/single_request_host_resolver.h',
-        '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',
-        'ftp/ftp_directory_listing_parser.h',
-        'ftp/ftp_directory_listing_parser_ls.cc',
-        'ftp/ftp_directory_listing_parser_ls.h',
-        'ftp/ftp_directory_listing_parser_netware.cc',
-        'ftp/ftp_directory_listing_parser_netware.h',
-        'ftp/ftp_directory_listing_parser_os2.cc',
-        'ftp/ftp_directory_listing_parser_os2.h',
-        'ftp/ftp_directory_listing_parser_vms.cc',
-        'ftp/ftp_directory_listing_parser_vms.h',
-        'ftp/ftp_directory_listing_parser_windows.cc',
-        'ftp/ftp_directory_listing_parser_windows.h',
-        'ftp/ftp_network_layer.cc',
-        'ftp/ftp_network_layer.h',
-        'ftp/ftp_network_session.cc',
-        'ftp/ftp_network_session.h',
-        'ftp/ftp_network_transaction.cc',
-        'ftp/ftp_network_transaction.h',
-        'ftp/ftp_request_info.h',
-        'ftp/ftp_response_info.cc',
-        'ftp/ftp_response_info.h',
-        'ftp/ftp_server_type_histograms.cc',
-        'ftp/ftp_server_type_histograms.h',
-        'ftp/ftp_transaction.h',
-        'ftp/ftp_transaction_factory.h',
-        'ftp/ftp_util.cc',
-        'ftp/ftp_util.h',
-        'http/des.cc',
-        'http/des.h',
-        'http/http_atom_list.h',
-        'http/http_auth.cc',
-        'http/http_auth.h',
-        'http/http_auth_cache.cc',
-        'http/http_auth_cache.h',
-        'http/http_auth_controller.cc',
-        'http/http_auth_controller.h',
-        'http/http_auth_filter.cc',
-        'http/http_auth_filter.h',
-        'http/http_auth_filter_win.h',
-        'http/http_auth_gssapi_posix.cc',
-        'http/http_auth_gssapi_posix.h',
-        'http/http_auth_handler.cc',
-        'http/http_auth_handler.h',
-        'http/http_auth_handler_basic.cc',
-        'http/http_auth_handler_basic.h',
-        'http/http_auth_handler_digest.cc',
-        'http/http_auth_handler_digest.h',
-        'http/http_auth_handler_factory.cc',
-        'http/http_auth_handler_factory.h',
-        'http/http_auth_handler_negotiate.cc',
-        'http/http_auth_handler_negotiate.h',
-        'http/http_auth_handler_ntlm.cc',
-        'http/http_auth_handler_ntlm.h',
-        'http/http_auth_handler_ntlm_portable.cc',
-        'http/http_auth_handler_ntlm_win.cc',
-        'http/http_auth_sspi_win.cc',
-        'http/http_auth_sspi_win.h',
-        'http/http_basic_state.cc',
-        'http/http_basic_state.h',
-        'http/http_basic_stream.cc',
-        'http/http_basic_stream.h',
-        'http/http_byte_range.cc',
-        'http/http_byte_range.h',
-        'http/http_cache.cc',
-        'http/http_cache.h',
-        'http/http_cache_transaction.cc',
-        'http/http_cache_transaction.h',
-        'http/http_content_disposition.cc',
-        'http/http_content_disposition.h',
-        'http/http_chunked_decoder.cc',
-        'http/http_chunked_decoder.h',
-        'http/http_network_layer.cc',
-        'http/http_network_layer.h',
-        'http/http_network_session.cc',
-        'http/http_network_session.h',
-        'http/http_network_session_peer.cc',
-        'http/http_network_session_peer.h',
-        'http/http_network_transaction.cc',
-        'http/http_network_transaction.h',
-        'http/http_pipelined_connection.h',
-        'http/http_pipelined_connection_impl.cc',
-        'http/http_pipelined_connection_impl.h',
-        'http/http_pipelined_host.cc',
-        'http/http_pipelined_host.h',
-        'http/http_pipelined_host_capability.h',
-        'http/http_pipelined_host_forced.cc',
-        'http/http_pipelined_host_forced.h',
-        'http/http_pipelined_host_impl.cc',
-        'http/http_pipelined_host_impl.h',
-        'http/http_pipelined_host_pool.cc',
-        'http/http_pipelined_host_pool.h',
-        'http/http_pipelined_stream.cc',
-        'http/http_pipelined_stream.h',
-        'http/http_proxy_client_socket.cc',
-        'http/http_proxy_client_socket.h',
-        'http/http_proxy_client_socket_pool.cc',
-        'http/http_proxy_client_socket_pool.h',
-        'http/http_request_headers.cc',
-        'http/http_request_headers.h',
-        'http/http_request_info.cc',
-        'http/http_request_info.h',
-        'http/http_response_body_drainer.cc',
-        'http/http_response_body_drainer.h',
-        'http/http_response_headers.cc',
-        'http/http_response_headers.h',
-        'http/http_response_info.cc',
-        'http/http_response_info.h',
-        'http/http_security_headers.cc',
-        'http/http_security_headers.h',
-        'http/http_server_properties.cc',
-        'http/http_server_properties.h',
-        'http/http_server_properties_impl.cc',
-        'http/http_server_properties_impl.h',
-        'http/http_status_code.cc',
-        'http/http_status_code.h',
-        'http/http_stream.h',
-        'http/http_stream_base.h',
-        'http/http_stream_factory.cc',
-        'http/http_stream_factory.h',
-        'http/http_stream_factory_impl.cc',
-        'http/http_stream_factory_impl.h',
-        'http/http_stream_factory_impl_job.cc',
-        'http/http_stream_factory_impl_job.h',
-        'http/http_stream_factory_impl_request.cc',
-        'http/http_stream_factory_impl_request.h',
-        'http/http_stream_parser.cc',
-        'http/http_stream_parser.h',
-        'http/http_transaction.h',
-        'http/http_transaction_delegate.h',
-        'http/http_transaction_factory.h',
-        'http/http_util.cc',
-        'http/http_util.h',
-        'http/http_util_icu.cc',
-        'http/http_vary_data.cc',
-        'http/http_vary_data.h',
-        'http/http_version.h',
-        'http/md4.cc',
-        'http/md4.h',
-        'http/partial_data.cc',
-        'http/partial_data.h',
-        'http/proxy_client_socket.h',
-        'http/proxy_client_socket.cc',
-        'http/proxy_connect_redirect_http_stream.h',
-        'http/proxy_connect_redirect_http_stream.cc',
-        'http/transport_security_state.cc',
-        'http/transport_security_state.h',
-        'http/transport_security_state_static.h',
-        'http/url_security_manager.cc',
-        'http/url_security_manager.h',
-        'http/url_security_manager_posix.cc',
-        'http/url_security_manager_win.cc',
-        'ocsp/nss_ocsp.cc',
-        'ocsp/nss_ocsp.h',
-        'proxy/dhcp_proxy_script_adapter_fetcher_win.cc',
-        'proxy/dhcp_proxy_script_adapter_fetcher_win.h',
-        'proxy/dhcp_proxy_script_fetcher.cc',
-        'proxy/dhcp_proxy_script_fetcher.h',
-        'proxy/dhcp_proxy_script_fetcher_factory.cc',
-        'proxy/dhcp_proxy_script_fetcher_factory.h',
-        'proxy/dhcp_proxy_script_fetcher_win.cc',
-        'proxy/dhcp_proxy_script_fetcher_win.h',
-        'proxy/dhcpcsvc_init_win.cc',
-        'proxy/dhcpcsvc_init_win.h',
-        'proxy/multi_threaded_proxy_resolver.cc',
-        'proxy/multi_threaded_proxy_resolver.h',
-        'proxy/network_delegate_error_observer.cc',
-        'proxy/network_delegate_error_observer.h',
-        'proxy/polling_proxy_config_service.cc',
-        'proxy/polling_proxy_config_service.h',
-        'proxy/proxy_bypass_rules.cc',
-        'proxy/proxy_bypass_rules.h',
-        'proxy/proxy_config.cc',
-        'proxy/proxy_config.h',
-        'proxy/proxy_config_service.h',
-        'proxy/proxy_config_service_android.cc',
-        'proxy/proxy_config_service_android.h',
-        'proxy/proxy_config_service_fixed.cc',
-        'proxy/proxy_config_service_fixed.h',
-        'proxy/proxy_config_service_ios.cc',
-        'proxy/proxy_config_service_ios.h',
-        'proxy/proxy_config_service_linux.cc',
-        'proxy/proxy_config_service_linux.h',
-        'proxy/proxy_config_service_mac.cc',
-        'proxy/proxy_config_service_mac.h',
-        'proxy/proxy_config_service_win.cc',
-        'proxy/proxy_config_service_win.h',
-        'proxy/proxy_config_source.cc',
-        'proxy/proxy_config_source.h',
-        'proxy/proxy_info.cc',
-        'proxy/proxy_info.h',
-        'proxy/proxy_list.cc',
-        'proxy/proxy_list.h',
-        'proxy/proxy_resolver.h',
-        'proxy/proxy_resolver_error_observer.h',
-        'proxy/proxy_resolver_mac.cc',
-        'proxy/proxy_resolver_mac.h',
-        'proxy/proxy_resolver_script.h',
-        'proxy/proxy_resolver_script_data.cc',
-        'proxy/proxy_resolver_script_data.h',
-        'proxy/proxy_resolver_winhttp.cc',
-        'proxy/proxy_resolver_winhttp.h',
-        'proxy/proxy_retry_info.h',
-        'proxy/proxy_script_decider.cc',
-        'proxy/proxy_script_decider.h',
-        'proxy/proxy_script_fetcher.h',
-        'proxy/proxy_script_fetcher_impl.cc',
-        'proxy/proxy_script_fetcher_impl.h',
-        'proxy/proxy_server.cc',
-        'proxy/proxy_server.h',
-        'proxy/proxy_server_mac.cc',
-        'proxy/proxy_service.cc',
-        'proxy/proxy_service.h',
-        'quic/congestion_control/available_channel_estimator.cc',
-        'quic/congestion_control/available_channel_estimator.h',
-        'quic/congestion_control/channel_estimator.cc',
-        'quic/congestion_control/channel_estimator.h',
-        'quic/congestion_control/cube_root.cc',
-        'quic/congestion_control/cube_root.h',
-        'quic/congestion_control/cubic.cc',
-        'quic/congestion_control/cubic.h',
-        'quic/congestion_control/fix_rate_receiver.cc',
-        'quic/congestion_control/fix_rate_receiver.h',
-        'quic/congestion_control/fix_rate_sender.cc',
-        'quic/congestion_control/fix_rate_sender.h',
-        'quic/congestion_control/hybrid_slow_start.cc',
-        'quic/congestion_control/hybrid_slow_start.h',
-        'quic/congestion_control/inter_arrival_bitrate_ramp_up.cc',
-        'quic/congestion_control/inter_arrival_bitrate_ramp_up.h',
-        'quic/congestion_control/inter_arrival_overuse_detector.cc',
-        'quic/congestion_control/inter_arrival_overuse_detector.h',
-        'quic/congestion_control/inter_arrival_probe.cc',
-        'quic/congestion_control/inter_arrival_probe.h',
-        'quic/congestion_control/inter_arrival_receiver.cc',
-        'quic/congestion_control/inter_arrival_receiver.h',
-        'quic/congestion_control/inter_arrival_sender.cc',
-        'quic/congestion_control/inter_arrival_sender.h',
-        'quic/congestion_control/inter_arrival_state_machine.cc',
-        'quic/congestion_control/inter_arrival_state_machine.h',
-        'quic/congestion_control/leaky_bucket.cc',
-        'quic/congestion_control/leaky_bucket.h',
-        'quic/congestion_control/paced_sender.cc',
-        'quic/congestion_control/paced_sender.h',
-        'quic/congestion_control/quic_congestion_manager.cc',
-        'quic/congestion_control/quic_congestion_manager.h',
-        'quic/congestion_control/quic_max_sized_map.h',
-        'quic/congestion_control/receive_algorithm_interface.cc',
-        'quic/congestion_control/receive_algorithm_interface.h',
-        'quic/congestion_control/send_algorithm_interface.cc',
-        'quic/congestion_control/send_algorithm_interface.h',
-        'quic/congestion_control/tcp_cubic_sender.cc',
-        'quic/congestion_control/tcp_cubic_sender.h',
-        'quic/congestion_control/tcp_receiver.cc',
-        'quic/congestion_control/tcp_receiver.h',
-        'quic/crypto/aes_128_gcm_12_decrypter.h',
-        'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
-        'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
-        'quic/crypto/aes_128_gcm_12_encrypter.h',
-        'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
-        'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
-        'quic/crypto/cert_compressor.cc',
-        'quic/crypto/cert_compressor.h',
-        'quic/crypto/channel_id.cc',
-        'quic/crypto/channel_id.h',
-        'quic/crypto/channel_id_nss.cc',
-        'quic/crypto/channel_id_openssl.cc',
-        'quic/crypto/common_cert_set.cc',
-        'quic/crypto/common_cert_set.h',
-        'quic/crypto/crypto_framer.cc',
-        'quic/crypto/crypto_framer.h',
-        'quic/crypto/crypto_handshake.cc',
-        'quic/crypto/crypto_handshake.h',
-        'quic/crypto/crypto_protocol.h',
-        'quic/crypto/crypto_secret_boxer.cc',
-        'quic/crypto/crypto_secret_boxer.h',
-        'quic/crypto/crypto_server_config_protobuf.cc',
-        'quic/crypto/crypto_server_config_protobuf.h',
-        'quic/crypto/crypto_utils.cc',
-        'quic/crypto/crypto_utils.h',
-        'quic/crypto/curve25519_key_exchange.cc',
-        'quic/crypto/curve25519_key_exchange.h',
-        'quic/crypto/ephemeral_key_source.h',
-        'quic/crypto/key_exchange.h',
-        'quic/crypto/null_decrypter.cc',
-        'quic/crypto/null_decrypter.h',
-        'quic/crypto/null_encrypter.cc',
-        'quic/crypto/null_encrypter.h',
-        'quic/crypto/p256_key_exchange.h',
-        'quic/crypto/p256_key_exchange_nss.cc',
-        'quic/crypto/p256_key_exchange_openssl.cc',
-        'quic/crypto/proof_source.h',
-        'quic/crypto/proof_source_chromium.cc',
-        'quic/crypto/proof_source_chromium.h',
-        'quic/crypto/proof_verifier.cc',
-        'quic/crypto/proof_verifier_chromium.cc',
-        'quic/crypto/proof_verifier_chromium.h',
-        'quic/crypto/quic_crypto_client_config.cc',
-        'quic/crypto/quic_crypto_client_config.h',
-        'quic/crypto/quic_crypto_server_config.cc',
-        'quic/crypto/quic_crypto_server_config.h',
-        'quic/crypto/quic_decrypter.cc',
-        'quic/crypto/quic_decrypter.h',
-        'quic/crypto/quic_encrypter.cc',
-        'quic/crypto/quic_encrypter.h',
-        'quic/crypto/quic_random.cc',
-        'quic/crypto/quic_random.h',
-        'quic/crypto/scoped_evp_cipher_ctx.cc',
-        'quic/crypto/scoped_evp_cipher_ctx.h',
-        'quic/crypto/strike_register.cc',
-        'quic/crypto/strike_register.h',
-        'quic/crypto/source_address_token.cc',
-        'quic/crypto/source_address_token.h',
-        'quic/iovector.cc',
-        'quic/iovector.h',
-        'quic/quic_ack_notifier.cc',
-        'quic/quic_ack_notifier.h',
-        'quic/quic_ack_notifier_manager.cc',
-        'quic/quic_ack_notifier_manager.h',
-        'quic/quic_alarm.cc',
-        'quic/quic_alarm.h',
-        'quic/quic_bandwidth.cc',
-        'quic/quic_bandwidth.h',
-        'quic/quic_blocked_writer_interface.h',
-        'quic/quic_client_session.cc',
-        'quic/quic_client_session.h',
-        'quic/quic_clock.cc',
-        'quic/quic_clock.h',
-        'quic/quic_config.cc',
-        'quic/quic_config.h',
-        'quic/quic_connection.cc',
-        'quic/quic_connection.h',
-        'quic/quic_connection_helper.cc',
-        'quic/quic_connection_helper.h',
-        'quic/quic_connection_logger.cc',
-        'quic/quic_connection_logger.h',
-        'quic/quic_connection_stats.cc',
-        'quic/quic_connection_stats.h',
-        'quic/quic_crypto_client_stream.cc',
-        'quic/quic_crypto_client_stream.h',
-        'quic/quic_crypto_client_stream_factory.h',
-        'quic/quic_crypto_server_stream.cc',
-        'quic/quic_crypto_server_stream.h',
-        'quic/quic_crypto_stream.cc',
-        'quic/quic_crypto_stream.h',
-        'quic/quic_data_reader.cc',
-        'quic/quic_data_reader.h',
-        'quic/quic_data_writer.cc',
-        'quic/quic_data_writer.h',
-        'quic/quic_default_packet_writer.cc',
-        'quic/quic_default_packet_writer.h',
-        'quic/quic_fec_group.cc',
-        'quic/quic_fec_group.h',
-        'quic/quic_framer.cc',
-        'quic/quic_framer.h',
-        'quic/quic_http_stream.cc',
-        'quic/quic_http_stream.h',
-        'quic/quic_http_utils.cc',
-        'quic/quic_http_utils.h',
-        'quic/quic_packet_creator.cc',
-        'quic/quic_packet_creator.h',
-        'quic/quic_packet_generator.cc',
-        'quic/quic_packet_generator.h',
-        'quic/quic_packet_writer.h',
-        'quic/quic_protocol.cc',
-        'quic/quic_protocol.h',
-        'quic/quic_received_packet_manager.cc',
-        'quic/quic_received_packet_manager.h',
-        'quic/quic_reliable_client_stream.cc',
-        'quic/quic_reliable_client_stream.h',
-        'quic/quic_sent_entropy_manager.cc',
-        'quic/quic_sent_entropy_manager.h',
-        'quic/quic_sent_packet_manager.cc',
-        'quic/quic_sent_packet_manager.h',
-        'quic/quic_session.cc',
-        'quic/quic_session.h',
-        'quic/quic_spdy_compressor.cc',
-        'quic/quic_spdy_compressor.h',
-        'quic/quic_spdy_decompressor.cc',
-        'quic/quic_spdy_decompressor.h',
-        'quic/quic_stream_factory.cc',
-        'quic/quic_stream_factory.h',
-        'quic/quic_stream_sequencer.cc',
-        'quic/quic_stream_sequencer.h',
-        'quic/quic_time.cc',
-        'quic/quic_time.h',
-        'quic/quic_utils.cc',
-        'quic/quic_utils.h',
-        'quic/reliable_quic_stream.cc',
-        'quic/reliable_quic_stream.h',
-        'quic/spdy_utils.cc',
-        'quic/spdy_utils.h',
-        'socket/buffered_write_stream_socket.cc',
-        'socket/buffered_write_stream_socket.h',
-        'socket/client_socket_factory.cc',
-        'socket/client_socket_factory.h',
-        'socket/client_socket_handle.cc',
-        'socket/client_socket_handle.h',
-        'socket/client_socket_pool.cc',
-        'socket/client_socket_pool.h',
-        'socket/client_socket_pool_base.cc',
-        'socket/client_socket_pool_base.h',
-        'socket/client_socket_pool_histograms.cc',
-        'socket/client_socket_pool_histograms.h',
-        'socket/client_socket_pool_manager.cc',
-        'socket/client_socket_pool_manager.h',
-        'socket/client_socket_pool_manager_impl.cc',
-        'socket/client_socket_pool_manager_impl.h',
-        'socket/next_proto.h',
-        'socket/nss_ssl_util.cc',
-        'socket/nss_ssl_util.h',
-        'socket/server_socket.h',
-        'socket/socket_descriptor.cc',
-        'socket/socket_descriptor.h',
-        'socket/socket_net_log_params.cc',
-        'socket/socket_net_log_params.h',
-        'socket/socket.h',
-        'socket/socks5_client_socket.cc',
-        'socket/socks5_client_socket.h',
-        'socket/socks_client_socket.cc',
-        'socket/socks_client_socket.h',
-        'socket/socks_client_socket_pool.cc',
-        'socket/socks_client_socket_pool.h',
-        'socket/ssl_client_socket.cc',
-        'socket/ssl_client_socket.h',
-        'socket/ssl_client_socket_nss.cc',
-        'socket/ssl_client_socket_nss.h',
-        'socket/ssl_client_socket_openssl.cc',
-        'socket/ssl_client_socket_openssl.h',
-        'socket/ssl_client_socket_pool.cc',
-        'socket/ssl_client_socket_pool.h',
-        'socket/ssl_error_params.cc',
-        'socket/ssl_error_params.h',
-        'socket/ssl_server_socket.h',
-        'socket/ssl_server_socket_nss.cc',
-        'socket/ssl_server_socket_nss.h',
-        'socket/ssl_server_socket_openssl.cc',
-        'socket/ssl_socket.h',
-        'socket/stream_listen_socket.cc',
-        'socket/stream_listen_socket.h',
-        'socket/stream_socket.cc',
-        'socket/stream_socket.h',
-        'socket/tcp_client_socket.cc',
-        'socket/tcp_client_socket.h',
-        'socket/tcp_listen_socket.cc',
-        'socket/tcp_listen_socket.h',
-        'socket/tcp_server_socket.cc',
-        'socket/tcp_server_socket.h',
-        'socket/tcp_socket.cc',
-        'socket/tcp_socket.h',
-        'socket/tcp_socket_libevent.cc',
-        'socket/tcp_socket_libevent.h',
-        'socket/tcp_socket_win.cc',
-        'socket/tcp_socket_win.h',
-        'socket/transport_client_socket_pool.cc',
-        'socket/transport_client_socket_pool.h',
-        'socket/unix_domain_socket_posix.cc',
-        'socket/unix_domain_socket_posix.h',
-        'socket_stream/socket_stream.cc',
-        'socket_stream/socket_stream.h',
-        'socket_stream/socket_stream_job.cc',
-        'socket_stream/socket_stream_job.h',
-        'socket_stream/socket_stream_job_manager.cc',
-        'socket_stream/socket_stream_job_manager.h',
-        'socket_stream/socket_stream_metrics.cc',
-        'socket_stream/socket_stream_metrics.h',
-        'spdy/buffered_spdy_framer.cc',
-        'spdy/buffered_spdy_framer.h',
-        'spdy/spdy_bitmasks.h',
-        'spdy/spdy_buffer.cc',
-        'spdy/spdy_buffer.h',
-        'spdy/spdy_buffer_producer.cc',
-        'spdy/spdy_buffer_producer.h',
-        'spdy/spdy_frame_builder.cc',
-        'spdy/spdy_frame_builder.h',
-        'spdy/spdy_frame_reader.cc',
-        'spdy/spdy_frame_reader.h',
-        'spdy/spdy_framer.cc',
-        'spdy/spdy_framer.h',
-        'spdy/spdy_header_block.cc',
-        'spdy/spdy_header_block.h',
-        'spdy/spdy_http_stream.cc',
-        'spdy/spdy_http_stream.h',
-        'spdy/spdy_http_utils.cc',
-        'spdy/spdy_http_utils.h',
-        'spdy/spdy_priority_forest.h',
-        'spdy/spdy_protocol.cc',
-        'spdy/spdy_protocol.h',
-        'spdy/spdy_proxy_client_socket.cc',
-        'spdy/spdy_proxy_client_socket.h',
-        'spdy/spdy_read_queue.cc',
-        'spdy/spdy_read_queue.h',
-        'spdy/spdy_session.cc',
-        'spdy/spdy_session.h',
-        'spdy/spdy_session_key.cc',
-        'spdy/spdy_session_key.h',
-        'spdy/spdy_session_pool.cc',
-        'spdy/spdy_session_pool.h',
-        'spdy/spdy_stream.cc',
-        'spdy/spdy_stream.h',
-        'spdy/spdy_websocket_stream.cc',
-        'spdy/spdy_websocket_stream.h',
-        'spdy/spdy_write_queue.cc',
-        'spdy/spdy_write_queue.h',
-        'spdy/write_blocked_list.h',
-        'ssl/client_cert_store.h',
-        'ssl/client_cert_store_impl.h',
-        'ssl/client_cert_store_impl_mac.cc',
-        'ssl/client_cert_store_impl_nss.cc',
-        'ssl/client_cert_store_impl_win.cc',
-        'ssl/default_server_bound_cert_store.cc',
-        'ssl/default_server_bound_cert_store.h',
-        'ssl/openssl_client_key_store.cc',
-        'ssl/openssl_client_key_store.h',
-        'ssl/server_bound_cert_service.cc',
-        'ssl/server_bound_cert_service.h',
-        'ssl/server_bound_cert_store.cc',
-        'ssl/server_bound_cert_store.h',
-        'ssl/ssl_cert_request_info.cc',
-        'ssl/ssl_cert_request_info.h',
-        'ssl/ssl_cipher_suite_names.cc',
-        'ssl/ssl_cipher_suite_names.h',
-        'ssl/ssl_client_auth_cache.cc',
-        'ssl/ssl_client_auth_cache.h',
-        'ssl/ssl_client_cert_type.h',
-        'ssl/ssl_config_service.cc',
-        'ssl/ssl_config_service.h',
-        'ssl/ssl_config_service_defaults.cc',
-        'ssl/ssl_config_service_defaults.h',
-        'ssl/ssl_info.cc',
-        'ssl/ssl_info.h',
-        'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
-        'third_party/mozilla_security_manager/nsKeygenHandler.h',
-        'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
-        'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
-        'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
-        'third_party/mozilla_security_manager/nsPKCS12Blob.h',
-        'udp/datagram_client_socket.h',
-        'udp/datagram_server_socket.h',
-        'udp/datagram_socket.h',
-        'udp/udp_client_socket.cc',
-        'udp/udp_client_socket.h',
-        'udp/udp_net_log_parameters.cc',
-        'udp/udp_net_log_parameters.h',
-        'udp/udp_server_socket.cc',
-        'udp/udp_server_socket.h',
-        'udp/udp_socket.h',
-        'udp/udp_socket_libevent.cc',
-        'udp/udp_socket_libevent.h',
-        'udp/udp_socket_win.cc',
-        'udp/udp_socket_win.h',
-        'url_request/data_protocol_handler.cc',
-        'url_request/data_protocol_handler.h',
-        'url_request/file_protocol_handler.cc',
-        'url_request/file_protocol_handler.h',
-        'url_request/fraudulent_certificate_reporter.h',
-        'url_request/ftp_protocol_handler.cc',
-        'url_request/ftp_protocol_handler.h',
-        'url_request/http_user_agent_settings.h',
-        'url_request/protocol_intercept_job_factory.cc',
-        'url_request/protocol_intercept_job_factory.h',
-        'url_request/static_http_user_agent_settings.cc',
-        'url_request/static_http_user_agent_settings.h',
-        'url_request/url_fetcher.cc',
-        'url_request/url_fetcher.h',
-        'url_request/url_fetcher_core.cc',
-        'url_request/url_fetcher_core.h',
-        'url_request/url_fetcher_delegate.cc',
-        'url_request/url_fetcher_delegate.h',
-        'url_request/url_fetcher_factory.h',
-        'url_request/url_fetcher_impl.cc',
-        'url_request/url_fetcher_impl.h',
-        'url_request/url_fetcher_response_writer.cc',
-        'url_request/url_fetcher_response_writer.h',
-        'url_request/url_request.cc',
-        'url_request/url_request.h',
-        'url_request/url_request_about_job.cc',
-        'url_request/url_request_about_job.h',
-        'url_request/url_request_context.cc',
-        'url_request/url_request_context.h',
-        'url_request/url_request_context_builder.cc',
-        'url_request/url_request_context_builder.h',
-        'url_request/url_request_context_getter.cc',
-        'url_request/url_request_context_getter.h',
-        'url_request/url_request_context_storage.cc',
-        'url_request/url_request_context_storage.h',
-        'url_request/url_request_data_job.cc',
-        'url_request/url_request_data_job.h',
-        'url_request/url_request_error_job.cc',
-        'url_request/url_request_error_job.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/url_request_filter.cc',
-        'url_request/url_request_filter.h',
-        'url_request/url_request_ftp_job.cc',
-        'url_request/url_request_ftp_job.h',
-        'url_request/url_request_http_job.cc',
-        'url_request/url_request_http_job.h',
-        'url_request/url_request_job.cc',
-        'url_request/url_request_job.h',
-        'url_request/url_request_job_factory.cc',
-        'url_request/url_request_job_factory.h',
-        'url_request/url_request_job_factory_impl.cc',
-        'url_request/url_request_job_factory_impl.h',
-        'url_request/url_request_job_manager.cc',
-        'url_request/url_request_job_manager.h',
-        'url_request/url_request_netlog_params.cc',
-        'url_request/url_request_netlog_params.h',
-        'url_request/url_request_redirect_job.cc',
-        'url_request/url_request_redirect_job.h',
-        'url_request/url_request_simple_job.cc',
-        'url_request/url_request_simple_job.h',
-        'url_request/url_request_status.h',
-        'url_request/url_request_test_job.cc',
-        'url_request/url_request_test_job.h',
-        'url_request/url_request_throttler_entry.cc',
-        'url_request/url_request_throttler_entry.h',
-        'url_request/url_request_throttler_entry_interface.h',
-        'url_request/url_request_throttler_header_adapter.cc',
-        'url_request/url_request_throttler_header_adapter.h',
-        'url_request/url_request_throttler_header_interface.h',
-        'url_request/url_request_throttler_manager.cc',
-        'url_request/url_request_throttler_manager.h',
-        'url_request/view_cache_helper.cc',
-        'url_request/view_cache_helper.h',
-        'websockets/websocket_basic_stream.cc',
-        'websockets/websocket_basic_stream.h',
-        'websockets/websocket_channel.cc',
-        'websockets/websocket_channel.h',
-        'websockets/websocket_deflate_predictor.h',
-        'websockets/websocket_deflate_predictor_impl.cc',
-        'websockets/websocket_deflate_predictor_impl.h',
-        'websockets/websocket_deflate_stream.cc',
-        'websockets/websocket_deflate_stream.h',
-        'websockets/websocket_deflater.cc',
-        'websockets/websocket_deflater.h',
-        '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_constants.cc',
-        'websockets/websocket_handshake_constants.h',
-        'websockets/websocket_handshake_handler.cc',
-        'websockets/websocket_handshake_handler.h',
-        'websockets/websocket_handshake_stream_base.h',
-        'websockets/websocket_inflater.cc',
-        'websockets/websocket_inflater.h',
-        'websockets/websocket_job.cc',
-        'websockets/websocket_job.h',
-        'websockets/websocket_mux.h',
-        'websockets/websocket_net_log_params.cc',
-        'websockets/websocket_net_log_params.h',
-        'websockets/websocket_stream.cc',
-        'websockets/websocket_stream.h',
-        'websockets/websocket_throttle.cc',
-        'websockets/websocket_throttle.h',
+        '<@(net_nacl_common_sources)',
+        '<@(net_non_nacl_sources)',
       ],
       'defines': [
         'NET_IMPLEMENTATION',
             ],
           },
           'sources!': [
-            'disk_cache/mapped_file_posix.cc',
+            'disk_cache/blockfile/mapped_file_posix.cc',
           ],
         }, { # else
           'sources!': [
-            'disk_cache/mapped_file_avoid_mmap_posix.cc',
+            '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/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', {
             'dns/dns_client.cc',
           ],
         }],
-        ['use_tracing_cache_backend==1', {
-          'defines': [
-            'USE_TRACING_CACHE_BACKEND'
-          ],
-         }],
         ['use_openssl==1', {
             'sources!': [
               'base/crypto_module_nss.cc',
               'cert/cert_database_nss.cc',
               'cert/cert_verify_proc_nss.cc',
               '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/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',
+              'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
+              'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
               'quic/crypto/channel_id_nss.cc',
               'quic/crypto/p256_key_exchange_nss.cc',
               'socket/nss_ssl_util.cc',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
-              'ssl/client_cert_store_impl_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
+            'dependencies': [
+              '../third_party/boringssl/boringssl.gyp:boringssl',
+            ],
           },
-          {  # else !use_openssl: remove the unneeded files
+          {  # else !use_openssl: remove the unneeded files and depend on NSS.
             'sources!': [
               'base/crypto_module_openssl.cc',
-              'base/keygen_handler_openssl.cc',
-              'base/openssl_private_key_store.h',
-              'base/openssl_private_key_store_android.cc',
-              'base/openssl_private_key_store_memory.cc',
-              'cert/cert_database_openssl.cc',
-              'cert/cert_verify_proc_openssl.cc',
-              'cert/cert_verify_proc_openssl.h',
+              'cert/ct_log_verifier_openssl.cc',
+              'cert/ct_objects_extractor_openssl.cc',
               'cert/jwk_serializer_openssl.cc',
-              'cert/test_root_certs_openssl.cc',
-              'cert/x509_certificate_openssl.cc',
+              'cert/sha256_legacy_support_openssl_win.cc',
               'cert/x509_util_openssl.cc',
               'cert/x509_util_openssl.h',
+              'crypto/scoped_openssl_types.h',
+              'quic/crypto/aead_base_decrypter_openssl.cc',
+              'quic/crypto/aead_base_encrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
+              'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
+              'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
               'quic/crypto/channel_id_openssl.cc',
               'quic/crypto/p256_key_exchange_openssl.cc',
-              'quic/crypto/scoped_evp_cipher_ctx.cc',
-              'quic/crypto/scoped_evp_cipher_ctx.h',
+              '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',
-              'ssl/openssl_client_key_store.cc',
-              'ssl/openssl_client_key_store.h',
+              'socket/ssl_server_socket_openssl.h',
+              'socket/ssl_session_cache_openssl.cc',
+              'socket/ssl_session_cache_openssl.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',
+                ],
+              }, {
+                'dependencies': [
+                  '../third_party/nss/nss.gyp:nspr',
+                  '../third_party/nss/nss.gyp:nss',
+                  'third_party/nss/ssl.gyp:libssl',
+                ],
+              }]
             ],
           },
         ],
+        [ 'use_openssl_certs == 0', {
+            'sources!': [
+              'base/keygen_handler_openssl.cc',
+              'base/openssl_private_key_store.h',
+              'base/openssl_private_key_store_android.cc',
+              'base/openssl_private_key_store_memory.cc',
+              'cert/cert_database_openssl.cc',
+              'cert/cert_verify_proc_openssl.cc',
+              'cert/cert_verify_proc_openssl.h',
+              'cert/test_root_certs_openssl.cc',
+              'cert/x509_certificate_openssl.cc',
+              'ssl/openssl_client_key_store.cc',
+              'ssl/openssl_client_key_store.h',
+            ],
+        }],
         [ 'use_glib == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gio',
             ],
+        }],
+        [ 'desktop_linux == 1 or chromeos == 1', {
             'conditions': [
-              ['use_openssl==1', {
-                'dependencies': [
-                  '../third_party/openssl/openssl.gyp:openssl',
-                ],
-              },
-              {  # else use_openssl==0, use NSS
-                'dependencies': [
-                  '../build/linux/system.gyp:ssl',
-                ],
-              }],
               ['os_bsd==1', {
                 'sources!': [
                   'base/network_change_notifier_linux.cc',
             ],
           },
         ],
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gdk',
-          ],
-        }],
         [ 'use_nss != 1', {
             'sources!': [
               'cert/cert_verify_proc_nss.cc',
               'cert/cert_verify_proc_nss.h',
-              'ssl/client_cert_store_impl_nss.cc',
+              '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', {
         [ 'OS == "win"', {
             'sources!': [
               'http/http_auth_handler_ntlm_portable.cc',
+              'socket/socket_libevent.cc',
+              'socket/socket_libevent.h',
               'socket/tcp_socket_libevent.cc',
               'socket/tcp_socket_libevent.h',
-              'ssl/client_cert_store_impl_nss.cc',
               'udp/udp_socket_libevent.cc',
               'udp/udp_socket_libevent.h',
             ],
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
-            ],
-            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
           }, { # else: OS != "win"
             'sources!': [
           },
         ],
         [ 'OS == "mac"', {
-            'sources!': [
-              'ssl/client_cert_store_impl_nss.cc',
-            ],
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
-            ],
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
           },
         ],
         [ 'OS == "ios"', {
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
+            'sources!': [
+              'disk_cache/blockfile/file_posix.cc',
             ],
             'link_settings': {
               'libraries': [
         }],
         [ 'OS == "android"', {
             'dependencies': [
-              '../third_party/openssl/openssl.gyp:openssl',
               'net_jni_headers',
             ],
             'sources!': [
               'cert/cert_verify_proc_openssl.cc',
               'cert/test_root_certs_openssl.cc',
             ],
-            # The net/android/keystore_openssl.cc source file needs to
-            # access an OpenSSL-internal header.
-            'include_dirs': [
-              '../third_party/openssl',
+          },
+        ],
+        [ 'use_icu_alternatives_on_android == 1', {
+            'dependencies!': [
+              '../base/base.gyp:base_i18n',
+              '../third_party/icu/icu.gyp:icui18n',
+              '../third_party/icu/icu.gyp:icuuc',
+            ],
+            'sources!': [
+              'base/filename_util_icu.cc',
+              'base/net_string_util_icu.cc',
+              'base/net_util_icu.cc',
+            ],
+            'sources': [
+              'base/net_string_util_icu_alternatives_android.cc',
+              'base/net_string_util_icu_alternatives_android.h',
             ],
           },
         ],
         ['OS == "android"', {
           'sources/': [
             ['include', '^base/platform_mime_util_linux\\.cc$'],
+            ['include', '^base/address_tracker_linux\\.cc$'],
+            ['include', '^base/address_tracker_linux\\.h$'],
           ],
         }],
         ['OS == "ios"', {
             ['include', '^cert/test_root_certs_nss\\.cc$'],
             ['include', '^cert/x509_util_nss\\.cc$'],
             ['include', '^cert/x509_util_nss\\.h$'],
-            ['include', '^dns/notify_watcher_mac\\.cc$'],
             ['include', '^proxy/proxy_resolver_mac\\.cc$'],
             ['include', '^proxy/proxy_server_mac\\.cc$'],
             ['include', '^ocsp/nss_ocsp\\.cc$'],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
+        '../base/base.gyp:base_prefs_test_support',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
+        '../crypto/crypto.gyp:crypto_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
+        'balsa',
         'http_server',
         'net',
-        'net_test_support'
+        'net_derived_sources',
+        'net_extras',
+        'net_test_support',
+        'quic_tools',
       ],
       'sources': [
-        'android/keystore_unittest.cc',
-        'android/network_change_notifier_android_unittest.cc',
-        'base/address_list_unittest.cc',
-        'base/address_tracker_linux_unittest.cc',
-        'base/backoff_entry_unittest.cc',
-        'base/big_endian_unittest.cc',
-        'base/data_url_unittest.cc',
-        'base/directory_lister_unittest.cc',
-        'base/dns_util_unittest.cc',
-        'base/escape_unittest.cc',
-        'base/expiring_cache_unittest.cc',
-        'base/file_stream_unittest.cc',
-        'base/filter_unittest.cc',
-        'base/int128_unittest.cc',
-        'base/gzip_filter_unittest.cc',
-        'base/host_mapping_rules_unittest.cc',
-        'base/host_port_pair_unittest.cc',
-        'base/ip_endpoint_unittest.cc',
-        'base/keygen_handler_unittest.cc',
-        'base/mime_sniffer_unittest.cc',
-        'base/mime_util_unittest.cc',
-        'base/mock_filter_context.cc',
-        'base/mock_filter_context.h',
-        'base/net_log_logger_unittest.cc',
-        'base/net_log_unittest.cc',
-        'base/net_log_unittest.h',
-        'base/net_util_unittest.cc',
-        'base/network_change_notifier_win_unittest.cc',
-        'base/prioritized_dispatcher_unittest.cc',
-        'base/priority_queue_unittest.cc',
-        'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
-        'base/sdch_filter_unittest.cc',
-        'base/static_cookie_policy_unittest.cc',
-        'base/test_completion_callback_unittest.cc',
-        'base/upload_bytes_element_reader_unittest.cc',
-        'base/upload_data_stream_unittest.cc',
-        'base/upload_file_element_reader_unittest.cc',
-        'base/url_util_unittest.cc',
-        'cert/cert_verify_proc_unittest.cc',
-        'cert/crl_set_unittest.cc',
-        'cert/ct_serialization_unittest.cc',
-        'cert/ev_root_ca_metadata_unittest.cc',
-        'cert/jwk_serializer_unittest.cc',
-        'cert/multi_threaded_cert_verifier_unittest.cc',
-        'cert/nss_cert_database_unittest.cc',
-        'cert/pem_tokenizer_unittest.cc',
-        'cert/test_root_certs_unittest.cc',
-        'cert/x509_certificate_unittest.cc',
-        'cert/x509_cert_types_unittest.cc',
-        'cert/x509_util_unittest.cc',
-        'cert/x509_util_nss_unittest.cc',
-        'cert/x509_util_openssl_unittest.cc',
-        'cookies/canonical_cookie_unittest.cc',
-        'cookies/cookie_constants_unittest.cc',
-        'cookies/cookie_monster_unittest.cc',
-        'cookies/cookie_store_unittest.h',
-        'cookies/cookie_util_unittest.cc',
-        'cookies/parsed_cookie_unittest.cc',
-        'disk_cache/addr_unittest.cc',
-        'disk_cache/backend_unittest.cc',
-        'disk_cache/bitmap_unittest.cc',
-        'disk_cache/block_files_unittest.cc',
-        'disk_cache/cache_util_unittest.cc',
-        'disk_cache/entry_unittest.cc',
-        'disk_cache/mapped_file_unittest.cc',
-        'disk_cache/simple/simple_index_file_unittest.cc',
-        'disk_cache/simple/simple_index_unittest.cc',
-        'disk_cache/simple/simple_test_util.h',
-        'disk_cache/simple/simple_test_util.cc',
-        'disk_cache/simple/simple_util_unittest.cc',
-        'disk_cache/simple/simple_version_upgrade_unittest.cc',
-        'disk_cache/storage_block_unittest.cc',
-        'disk_cache/flash/log_store_entry_unittest.cc',
-        'disk_cache/flash/log_store_unittest.cc',
-        'disk_cache/flash/segment_unittest.cc',
-        'disk_cache/flash/storage_unittest.cc',
-        'disk_cache/v3/block_bitmaps_unittest.cc',
-        'dns/address_sorter_posix_unittest.cc',
-        'dns/address_sorter_unittest.cc',
-        'dns/dns_config_service_posix_unittest.cc',
-        'dns/dns_config_service_unittest.cc',
-        'dns/dns_config_service_win_unittest.cc',
-        'dns/dns_hosts_unittest.cc',
-        'dns/dns_query_unittest.cc',
-        'dns/dns_response_unittest.cc',
-        'dns/dns_session_unittest.cc',
-        'dns/dns_transaction_unittest.cc',
-        'dns/host_cache_unittest.cc',
-        'dns/host_resolver_impl_unittest.cc',
-        'dns/mapped_host_resolver_unittest.cc',
-        'dns/mdns_cache_unittest.cc',
-        'dns/mdns_client_unittest.cc',
-        'dns/serial_worker_unittest.cc',
-        'dns/record_parsed_unittest.cc',
-        'dns/record_rdata_unittest.cc',
-        'dns/single_request_host_resolver_unittest.cc',
-        'ftp/ftp_auth_cache_unittest.cc',
-        'ftp/ftp_ctrl_response_buffer_unittest.cc',
-        'ftp/ftp_directory_listing_parser_ls_unittest.cc',
-        'ftp/ftp_directory_listing_parser_netware_unittest.cc',
-        'ftp/ftp_directory_listing_parser_os2_unittest.cc',
-        'ftp/ftp_directory_listing_parser_unittest.cc',
-        'ftp/ftp_directory_listing_parser_unittest.h',
-        'ftp/ftp_directory_listing_parser_vms_unittest.cc',
-        'ftp/ftp_directory_listing_parser_windows_unittest.cc',
-        'ftp/ftp_network_transaction_unittest.cc',
-        'ftp/ftp_util_unittest.cc',
-        'http/des_unittest.cc',
-        'http/http_auth_cache_unittest.cc',
-        'http/http_auth_controller_unittest.cc',
-        'http/http_auth_filter_unittest.cc',
-        'http/http_auth_gssapi_posix_unittest.cc',
-        'http/http_auth_handler_basic_unittest.cc',
-        'http/http_auth_handler_digest_unittest.cc',
-        'http/http_auth_handler_factory_unittest.cc',
-        'http/http_auth_handler_mock.cc',
-        'http/http_auth_handler_mock.h',
-        'http/http_auth_handler_negotiate_unittest.cc',
-        'http/http_auth_handler_unittest.cc',
-        'http/http_auth_sspi_win_unittest.cc',
-        'http/http_auth_unittest.cc',
-        'http/http_basic_state_unittest.cc',
-        'http/http_byte_range_unittest.cc',
-        'http/http_cache_unittest.cc',
-        'http/http_chunked_decoder_unittest.cc',
-        'http/http_content_disposition_unittest.cc',
-        'http/http_network_layer_unittest.cc',
-        'http/http_network_transaction_ssl_unittest.cc',
-        'http/http_network_transaction_unittest.cc',
-        'http/http_pipelined_connection_impl_unittest.cc',
-        'http/http_pipelined_host_forced_unittest.cc',
-        'http/http_pipelined_host_impl_unittest.cc',
-        'http/http_pipelined_host_pool_unittest.cc',
-        'http/http_pipelined_host_test_util.cc',
-        'http/http_pipelined_host_test_util.h',
-        'http/http_pipelined_network_transaction_unittest.cc',
-        'http/http_proxy_client_socket_pool_unittest.cc',
-        'http/http_request_headers_unittest.cc',
-        'http/http_response_body_drainer_unittest.cc',
-        'http/http_response_headers_unittest.cc',
-        'http/http_security_headers_unittest.cc',
-        'http/http_server_properties_impl_unittest.cc',
-        'http/http_status_code_unittest.cc',
-        'http/http_stream_factory_impl_request_unittest.cc',
-        'http/http_stream_factory_impl_unittest.cc',
-        'http/http_stream_parser_unittest.cc',
-        'http/http_transaction_unittest.cc',
-        'http/http_transaction_unittest.h',
-        'http/http_util_unittest.cc',
-        'http/http_vary_data_unittest.cc',
-        'http/mock_allow_url_security_manager.cc',
-        'http/mock_allow_url_security_manager.h',
-        'http/mock_gssapi_library_posix.cc',
-        'http/mock_gssapi_library_posix.h',
-        'http/mock_http_cache.cc',
-        'http/mock_http_cache.h',
-        'http/mock_sspi_library_win.cc',
-        'http/mock_sspi_library_win.h',
-        'http/transport_security_state_unittest.cc',
-        'http/url_security_manager_unittest.cc',
-        'ocsp/nss_ocsp_unittest.cc',
-        'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc',
-        'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc',
-        'proxy/dhcp_proxy_script_fetcher_win_unittest.cc',
-        'proxy/multi_threaded_proxy_resolver_unittest.cc',
-        'proxy/network_delegate_error_observer_unittest.cc',
-        'proxy/proxy_bypass_rules_unittest.cc',
-        'proxy/proxy_config_service_android_unittest.cc',
-        'proxy/proxy_config_service_linux_unittest.cc',
-        'proxy/proxy_config_service_win_unittest.cc',
-        'proxy/proxy_config_unittest.cc',
-        'proxy/proxy_info_unittest.cc',
-        'proxy/proxy_list_unittest.cc',
-        'proxy/proxy_resolver_v8_tracing_unittest.cc',
-        'proxy/proxy_resolver_v8_unittest.cc',
-        'proxy/proxy_script_decider_unittest.cc',
-        'proxy/proxy_script_fetcher_impl_unittest.cc',
-        'proxy/proxy_server_unittest.cc',
-        'proxy/proxy_service_unittest.cc',
-        'quic/congestion_control/available_channel_estimator_test.cc',
-        'quic/congestion_control/channel_estimator_test.cc',
-        'quic/congestion_control/cube_root_test.cc',
-        'quic/congestion_control/cubic_test.cc',
-        'quic/congestion_control/fix_rate_test.cc',
-        'quic/congestion_control/hybrid_slow_start_test.cc',
-        'quic/congestion_control/inter_arrival_bitrate_ramp_up_test.cc',
-        'quic/congestion_control/inter_arrival_overuse_detector_test.cc',
-        'quic/congestion_control/inter_arrival_probe_test.cc',
-        'quic/congestion_control/inter_arrival_receiver_test.cc',
-        'quic/congestion_control/inter_arrival_state_machine_test.cc',
-        'quic/congestion_control/inter_arrival_sender_test.cc',
-        'quic/congestion_control/leaky_bucket_test.cc',
-        'quic/congestion_control/paced_sender_test.cc',
-        'quic/congestion_control/quic_congestion_control_test.cc',
-        'quic/congestion_control/quic_congestion_manager_test.cc',
-        'quic/congestion_control/quic_max_sized_map_test.cc',
-        'quic/congestion_control/tcp_cubic_sender_test.cc',
-        'quic/congestion_control/tcp_receiver_test.cc',
-        'quic/crypto/aes_128_gcm_12_decrypter_test.cc',
-        'quic/crypto/aes_128_gcm_12_encrypter_test.cc',
-        'quic/crypto/cert_compressor_test.cc',
-        'quic/crypto/channel_id_test.cc',
-        'quic/crypto/common_cert_set_test.cc',
-        'quic/crypto/crypto_framer_test.cc',
-        'quic/crypto/crypto_secret_boxer_test.cc',
-        'quic/crypto/crypto_server_test.cc',
-        'quic/crypto/crypto_utils_test.cc',
-        'quic/crypto/curve25519_key_exchange_test.cc',
-        'quic/crypto/null_decrypter_test.cc',
-        'quic/crypto/null_encrypter_test.cc',
-        'quic/crypto/p256_key_exchange_test.cc',
-        'quic/crypto/proof_test.cc',
-        'quic/crypto/quic_crypto_server_config_test.cc',
-        'quic/crypto/quic_random_test.cc',
-        'quic/crypto/strike_register_test.cc',
-        'quic/iovector_test.cc',
-        'quic/test_tools/crypto_test_utils.cc',
-        'quic/test_tools/crypto_test_utils.h',
-        'quic/test_tools/crypto_test_utils_chromium.cc',
-        'quic/test_tools/crypto_test_utils_nss.cc',
-        'quic/test_tools/crypto_test_utils_openssl.cc',
-        'quic/test_tools/mock_clock.cc',
-        'quic/test_tools/mock_clock.h',
-        'quic/test_tools/mock_crypto_client_stream.cc',
-        'quic/test_tools/mock_crypto_client_stream.h',
-        'quic/test_tools/mock_crypto_client_stream_factory.cc',
-        'quic/test_tools/mock_crypto_client_stream_factory.h',
-        'quic/test_tools/mock_random.cc',
-        'quic/test_tools/mock_random.h',
-        'quic/test_tools/quic_client_session_peer.cc',
-        'quic/test_tools/quic_client_session_peer.h',
-        'quic/test_tools/quic_connection_peer.cc',
-        'quic/test_tools/quic_connection_peer.h',
-        'quic/test_tools/quic_framer_peer.cc',
-        'quic/test_tools/quic_framer_peer.h',
-        'quic/test_tools/quic_packet_creator_peer.cc',
-        'quic/test_tools/quic_packet_creator_peer.h',
-        'quic/test_tools/quic_received_packet_manager_peer.cc',
-        'quic/test_tools/quic_received_packet_manager_peer.h',
-        'quic/test_tools/quic_session_peer.cc',
-        'quic/test_tools/quic_session_peer.h',
-        'quic/test_tools/quic_test_utils.cc',
-        'quic/test_tools/quic_test_utils.h',
-        'quic/test_tools/quic_test_writer.cc',
-        'quic/test_tools/quic_test_writer.h',
-        'quic/test_tools/reliable_quic_stream_peer.cc',
-        'quic/test_tools/reliable_quic_stream_peer.h',
-        'quic/test_tools/simple_quic_framer.cc',
-        'quic/test_tools/simple_quic_framer.h',
-        'quic/test_tools/test_task_runner.cc',
-        'quic/test_tools/test_task_runner.h',
-        'quic/quic_ack_notifier_test.cc',
-        'quic/quic_alarm_test.cc',
-        'quic/quic_bandwidth_test.cc',
-        'quic/quic_client_session_test.cc',
-        'quic/quic_clock_test.cc',
-        'quic/quic_config_test.cc',
-        'quic/quic_connection_helper_test.cc',
-        'quic/quic_connection_test.cc',
-        'quic/quic_crypto_client_stream_test.cc',
-        'quic/quic_crypto_server_stream_test.cc',
-        'quic/quic_crypto_stream_test.cc',
-        'quic/quic_data_writer_test.cc',
-        'quic/quic_fec_group_test.cc',
-        'quic/quic_framer_test.cc',
-        'quic/quic_http_stream_test.cc',
-        'quic/quic_http_utils_test.cc',
-        'quic/quic_network_transaction_unittest.cc',
-        'quic/quic_packet_creator_test.cc',
-        'quic/quic_packet_generator_test.cc',
-        'quic/quic_protocol_test.cc',
-        'quic/quic_received_packet_manager_test.cc',
-        'quic/quic_reliable_client_stream_test.cc',
-        'quic/quic_sent_entropy_manager_test.cc',
-        'quic/quic_sent_packet_manager_test.cc',
-        'quic/quic_session_test.cc',
-        'quic/quic_spdy_compressor_test.cc',
-        'quic/quic_spdy_decompressor_test.cc',
-        'quic/quic_stream_factory_test.cc',
-        'quic/quic_stream_sequencer_test.cc',
-        'quic/quic_time_test.cc',
-        'quic/quic_utils_test.cc',
-        'quic/reliable_quic_stream_test.cc',
-        'server/http_server_response_info_unittest.cc',
-        'server/http_server_unittest.cc',
-        'socket/buffered_write_stream_socket_unittest.cc',
-        'socket/client_socket_pool_base_unittest.cc',
-        'socket/deterministic_socket_data_unittest.cc',
-        'socket/mock_client_socket_pool_manager.cc',
-        'socket/mock_client_socket_pool_manager.h',
-        'socket/socks5_client_socket_unittest.cc',
-        'socket/socks_client_socket_pool_unittest.cc',
-        'socket/socks_client_socket_unittest.cc',
-        'socket/ssl_client_socket_openssl_unittest.cc',
-        'socket/ssl_client_socket_pool_unittest.cc',
-        'socket/ssl_client_socket_unittest.cc',
-        'socket/ssl_server_socket_unittest.cc',
-        'socket/tcp_client_socket_unittest.cc',
-        'socket/tcp_listen_socket_unittest.cc',
-        'socket/tcp_listen_socket_unittest.h',
-        'socket/tcp_server_socket_unittest.cc',
-        'socket/tcp_socket_unittest.cc',
-        'socket/transport_client_socket_pool_unittest.cc',
-        'socket/transport_client_socket_unittest.cc',
-        'socket/unix_domain_socket_posix_unittest.cc',
-        'socket_stream/socket_stream_metrics_unittest.cc',
-        'socket_stream/socket_stream_unittest.cc',
-        'spdy/buffered_spdy_framer_unittest.cc',
-        'spdy/spdy_buffer_unittest.cc',
-        'spdy/spdy_frame_builder_test.cc',
-        'spdy/spdy_frame_reader_test.cc',
-        'spdy/spdy_framer_test.cc',
-        'spdy/spdy_header_block_unittest.cc',
-        'spdy/spdy_http_stream_unittest.cc',
-        'spdy/spdy_http_utils_unittest.cc',
-        'spdy/spdy_network_transaction_unittest.cc',
-        'spdy/spdy_priority_forest_test.cc',
-        'spdy/spdy_protocol_test.cc',
-        'spdy/spdy_proxy_client_socket_unittest.cc',
-        'spdy/spdy_read_queue_unittest.cc',
-        'spdy/spdy_session_pool_unittest.cc',
-        'spdy/spdy_session_test_util.cc',
-        'spdy/spdy_session_test_util.h',
-        'spdy/spdy_session_unittest.cc',
-        'spdy/spdy_stream_test_util.cc',
-        'spdy/spdy_stream_test_util.h',
-        'spdy/spdy_stream_unittest.cc',
-        'spdy/spdy_test_util_common.cc',
-        'spdy/spdy_test_util_common.h',
-        'spdy/spdy_test_utils.cc',
-        'spdy/spdy_test_utils.h',
-        'spdy/spdy_websocket_stream_unittest.cc',
-        'spdy/spdy_websocket_test_util.cc',
-        'spdy/spdy_websocket_test_util.h',
-        'spdy/spdy_write_queue_unittest.cc',
-        'spdy/write_blocked_list_test.cc',
-        'ssl/client_cert_store_impl_unittest.cc',
-        'ssl/default_server_bound_cert_store_unittest.cc',
-        'ssl/openssl_client_key_store_unittest.cc',
-        'ssl/server_bound_cert_service_unittest.cc',
-        'ssl/ssl_cipher_suite_names_unittest.cc',
-        'ssl/ssl_client_auth_cache_unittest.cc',
-        'ssl/ssl_config_service_unittest.cc',
-        'test/embedded_test_server/embedded_test_server_unittest.cc',
-        'test/embedded_test_server/http_request_unittest.cc',
-        'test/embedded_test_server/http_response_unittest.cc',
-        'test/python_utils_unittest.cc',
-        'test/run_all_unittests.cc',
-        'test/test_certificate_data.h',
-        'tools/dump_cache/url_to_filename_encoder.cc',
-        'tools/dump_cache/url_to_filename_encoder.h',
-        'tools/dump_cache/url_to_filename_encoder_unittest.cc',
-        'tools/dump_cache/url_utilities.h',
-        'tools/dump_cache/url_utilities.cc',
-        'tools/dump_cache/url_utilities_unittest.cc',
-        'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
-        'udp/udp_socket_unittest.cc',
-        'url_request/url_fetcher_impl_unittest.cc',
-        'url_request/url_request_context_builder_unittest.cc',
-        'url_request/url_request_filter_unittest.cc',
-        'url_request/url_request_ftp_job_unittest.cc',
-        'url_request/url_request_http_job_unittest.cc',
-        'url_request/url_request_job_factory_impl_unittest.cc',
-        'url_request/url_request_job_unittest.cc',
-        'url_request/url_request_throttler_simulation_unittest.cc',
-        'url_request/url_request_throttler_test_support.cc',
-        'url_request/url_request_throttler_test_support.h',
-        'url_request/url_request_throttler_unittest.cc',
-        'url_request/url_request_unittest.cc',
-        'url_request/view_cache_helper_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_errors_test.cc',
-        'websockets/websocket_extension_parser_test.cc',
-        'websockets/websocket_frame_parser_test.cc',
-        'websockets/websocket_frame_test.cc',
-        'websockets/websocket_handshake_handler_test.cc',
-        'websockets/websocket_handshake_handler_spdy_test.cc',
-        'websockets/websocket_inflater_test.cc',
-        'websockets/websocket_job_test.cc',
-        'websockets/websocket_net_log_params_test.cc',
-        'websockets/websocket_test_util.cc',
-        'websockets/websocket_test_util.h',
-        'websockets/websocket_throttle_test.cc',
+        '<@(net_test_sources)',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'dependencies': [
-            'balsa',
             'epoll_server',
             'flip_in_mem_edsm_server_base',
             'quic_base',
           ],
           'sources': [
-            'quic/quic_end_to_end_unittest.cc',
-            'tools/balsa/balsa_frame_test.cc',
-            'tools/balsa/balsa_headers_test.cc',
-            'tools/flip_server/flip_test_utils.cc',
-            'tools/flip_server/flip_test_utils.h',
-            'tools/flip_server/http_interface_test.cc',
-            'tools/flip_server/mem_cache_test.cc',
-            'tools/flip_server/spdy_interface_test.cc',
-            'tools/quic/end_to_end_test.cc',
-            'tools/quic/quic_client_session_test.cc',
-            'tools/quic/quic_dispatcher_test.cc',
-            'tools/quic/quic_epoll_clock_test.cc',
-            'tools/quic/quic_epoll_connection_helper_test.cc',
-            'tools/quic/quic_in_memory_cache_test.cc',
-            'tools/quic/quic_reliable_client_stream_test.cc',
-            'tools/quic/quic_reliable_server_stream_test.cc',
-            'tools/quic/quic_server_session_test.cc',
-            'tools/quic/quic_server_test.cc',
-            'tools/quic/quic_spdy_server_stream_test.cc',
-            'tools/quic/quic_time_wait_list_manager_test.cc',
-            'tools/quic/test_tools/http_message_test_utils.cc',
-            'tools/quic/test_tools/http_message_test_utils.h',
-            'tools/quic/test_tools/mock_epoll_server.cc',
-            'tools/quic/test_tools/mock_epoll_server.h',
-            'tools/quic/test_tools/mock_quic_dispatcher.cc',
-            'tools/quic/test_tools/mock_quic_dispatcher.h',
-            'tools/quic/test_tools/packet_dropping_test_writer.cc',
-            'tools/quic/test_tools/packet_dropping_test_writer.h',
-            'tools/quic/test_tools/quic_client_peer.cc',
-            'tools/quic/test_tools/quic_client_peer.h',
-            'tools/quic/test_tools/quic_dispatcher_peer.cc',
-            'tools/quic/test_tools/quic_dispatcher_peer.h',
-            'tools/quic/test_tools/quic_in_memory_cache_peer.h',
-            'tools/quic/test_tools/quic_in_memory_cache_peer.cc',
-            'tools/quic/test_tools/quic_server_peer.cc',
-            'tools/quic/test_tools/quic_server_peer.h',
-            'tools/quic/test_tools/quic_test_client.cc',
-            'tools/quic/test_tools/quic_test_client.h',
-            'tools/quic/test_tools/quic_test_utils.cc',
-            'tools/quic/test_tools/quic_test_utils.h',
-            'tools/quic/test_tools/server_thread.h',
-            'tools/quic/test_tools/server_thread.cc',
+            '<@(net_linux_test_sources)',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
-            'base/network_change_notifier_linux_unittest.cc',
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
+            # See bug http://crbug.com/344533.
+            'disk_cache/blockfile/index_table_v3_unittest.cc',
             # No res_ninit() et al on Android, so this doesn't make a lot of
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
-            'ssl/client_cert_store_impl_unittest.cc',
           ],
           'dependencies': [
             'net_javatests',
             'net_test_jni_headers',
           ],
         }],
-        [ 'use_glib == 1', {
-            'dependencies': [
-              '../build/linux/system.gyp:ssl',
-            ],
-          }, {  # else use_glib == 0: !posix || mac
-            'sources!': [
-              'cert/nss_cert_database_unittest.cc',
-            ],
-          },
-        ],
-        [ 'toolkit_uses_gtk == 1', {
-            'dependencies': [
-              '../build/linux/system.gyp:gtk',
-            ],
-          },
-        ],
+        [ 'use_nss != 1', {
+          'sources!': [
+            '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', {
+              'dependencies': [
+                '../build/linux/system.gyp:ssl',
+              ],
+            }, {  # desktop_linux == 0 and chromeos == 0
+              'dependencies': [
+                '../third_party/nss/nss.gyp:nspr',
+                '../third_party/nss/nss.gyp:nss',
+                'third_party/nss/ssl.gyp:libssl',
+              ],
+              'sources!': [
+                'cert/nss_cert_database_unittest.cc',
+              ],
+            }],
+          ],
+        }],
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
-            ['linux_use_tcmalloc==1', {
+            ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             'http/mock_gssapi_library_posix.h',
           ],
         }],
-        [ 'use_openssl == 1 or (use_glib == 0 and OS != "ios")', {
+        [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "ios")', {
           # Only include this test when on Posix and using NSS for
           # cert verification or on iOS (which also uses NSS for certs).
           'sources!': [
           ],
         }],
         [ 'use_openssl==1', {
-            # When building for OpenSSL, we need to exclude NSS specific tests.
+            # 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_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',
-              'ssl/client_cert_store_impl_unittest.cc',
             ],
-          }, {  # else !use_openssl: remove the unneeded files
+          }, {  # 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',
-              'ssl/openssl_client_key_store_unittest.cc',
-            ],
-            'sources/': [
-              ['exclude', '^tools/flip_server'],
+              'socket/ssl_session_cache_openssl_unittest.cc',
             ],
           },
         ],
+        [ 'use_openssl_certs == 0', {
+            'sources!': [
+              'ssl/openssl_client_key_store_unittest.cc',
+            ],
+        }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
             ],
         }],
+        ['disable_file_support==1', {
+          'sources!': [
+            'base/directory_lister_unittest.cc',
+            'url_request/url_request_file_job_unittest.cc',
+          ],
+        }],
         [ 'disable_ftp_support==1', {
             'sources/': [
               ['exclude', '^ftp/'],
             ],
           },
         ],
-        [ 'use_v8_in_net==1', {
+        # 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',
             ],
               'dns/dns_config_service_posix_unittest.cc',
               'http/http_auth_gssapi_posix_unittest.cc',
             ],
-            # This is needed to trigger the dll copy step on windows.
-            # TODO(mark): Specifying this here shouldn't be necessary.
-            'dependencies': [
-              '../third_party/icu/icu.gyp:icudata',
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
-            ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
-          },
-        ],
-        [ 'OS == "mac"', {
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
+            'conditions': [
+              [ 'icu_use_data_file_flag == 0', {
+                # This is needed to trigger the dll copy step on windows.
+                # TODO(mark): Specifying this here shouldn't be necessary.
+                'dependencies': [
+                  '../third_party/icu/icu.gyp:icudata',
+                ],
+              }],
             ],
           },
         ],
         [ 'OS == "ios"', {
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nss',
-            ],
             'actions': [
               {
                 'action_name': 'copy_test_data',
               # implementation is missing or incomplete.
               # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
               'base/keygen_handler_unittest.cc',
-              # Need to read input data files.
-              'base/gzip_filter_unittest.cc',
               'disk_cache/backend_unittest.cc',
-              'disk_cache/block_files_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',
-              'ssl/client_cert_store_impl_unittest.cc',
               'url_request/url_fetcher_impl_unittest.cc',
               'url_request/url_request_context_builder_unittest.cc',
               # Needs GetAppOutput().
               # The following tests are disabled because they don't apply to
               # iOS.
               # OS is not "linux" or "freebsd" or "openbsd".
-              'socket/unix_domain_socket_posix_unittest.cc',
-            ],
-            'conditions': [
-              ['coverage != 0', {
-                'sources!': [
-                  # These sources can't be built with coverage due to a
-                  # toolchain bug: http://openradar.appspot.com/radar?id=1499403
-                  'http/transport_security_state_unittest.cc',
+              'socket/unix_domain_client_socket_posix_unittest.cc',
+              'socket/unix_domain_listen_socket_posix_unittest.cc',
+              'socket/unix_domain_server_socket_posix_unittest.cc',
 
-                  # These tests crash when run with coverage turned on due to an
-                  # issue with llvm_gcda_increment_indirect_counter:
-                  # http://crbug.com/156058
-                  'cookies/cookie_monster_unittest.cc',
-                  'cookies/cookie_store_unittest.h',
-                  'http/http_auth_controller_unittest.cc',
-                  'http/http_network_layer_unittest.cc',
-                  'http/http_network_transaction_unittest.cc',
-                  'spdy/spdy_http_stream_unittest.cc',
-                  'spdy/spdy_proxy_client_socket_unittest.cc',
-                  'spdy/spdy_session_unittest.cc',
-
-                  # These tests crash when run with coverage turned on:
-                  # http://crbug.com/177203
-                  'proxy/proxy_service_unittest.cc',
-                ],
-              }],
+              # See bug http://crbug.com/344533.
+              'disk_cache/blockfile/index_table_v3_unittest.cc',
             ],
         }],
         [ 'OS == "android"', {
-            'dependencies': [
-              '../third_party/openssl/openssl.gyp:openssl',
-            ],
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
             ],
           },
         ],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
+          # TODO(mmenke):  This depends on test_support_base, which depends on
+          #                icu.  Figure out a way to remove that dependency.
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ]
         }],
+        [ 'use_icu_alternatives_on_android == 1', {
+            'dependencies!': [
+              '../base/base.gyp:base_i18n',
+            ],
+            'sources!': [
+              'base/filename_util_unittest.cc',
+              'base/net_util_icu_unittest.cc',
+            ],
+          },
+        ],
+        ['v8_use_external_startup_data==1', {
+          'dependencies': [
+            '../gin/gin.gyp:gin',
+          ]
+        }],
+      ],
+      'target_conditions': [
+        # These source files are excluded by default platform rules, but they
+        # are needed in specific cases on other platforms. Re-including them can
+        # only be done in target_conditions as it is evaluated after the
+        # platform rules.
+        ['OS == "android"', {
+          'sources/': [
+            ['include', '^base/address_tracker_linux_unittest\\.cc$'],
+          ],
+        }],
       ],
     },
     {
       ],
       'sources': [
         'cookies/cookie_monster_perftest.cc',
-        'disk_cache/disk_cache_perftest.cc',
+        'disk_cache/blockfile/disk_cache_perftest.cc',
         'proxy/proxy_resolver_perftest.cc',
+        'websockets/websocket_frame_perftest.cc',
       ],
       'conditions': [
         [ 'use_v8_in_net==1', {
             ],
           },
         ],
-        # This is needed to trigger the dll copy step on windows.
-        # TODO(mark): Specifying this here shouldn't be necessary.
         [ 'OS == "win"', {
-            'dependencies': [
-              '../third_party/icu/icu.gyp:icudata',
+            'conditions': [
+              [ 'icu_use_data_file_flag == 0', {
+                # This is needed to trigger the dll copy step on windows.
+                # TODO(mark): Specifying this here shouldn't be necessary.
+                'dependencies': [
+                  '../third_party/icu/icu.gyp:icudata',
+                ],
+              }],
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
-          },
-        ],
+        }],
+        [ 'enable_websockets != 1', {
+          'sources!': [
+            'websockets/websocket_frame_perftest.cc',
+          ],
+        }],
       ],
     },
     {
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
+        # TODO(mmenke):  This depends on icu, figure out a way to build tests
+        #                without icu.
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../testing/gmock.gyp:gmock',
         'disk_cache/disk_cache_test_base.h',
         'disk_cache/disk_cache_test_util.cc',
         'disk_cache/disk_cache_test_util.h',
-        'disk_cache/flash/flash_cache_test_base.h',
-        'disk_cache/flash/flash_cache_test_base.cc',
         'dns/dns_test_util.cc',
         'dns/dns_test_util.h',
         'dns/mock_host_resolver.cc',
         'dns/mock_host_resolver.h',
         'dns/mock_mdns_socket_factory.cc',
         'dns/mock_mdns_socket_factory.h',
+        'http/http_transaction_test_util.cc',
+        'http/http_transaction_test_util.h',
         'proxy/mock_proxy_resolver.cc',
         'proxy/mock_proxy_resolver.h',
         'proxy/mock_proxy_script_fetcher.cc',
         'socket/socket_test_util.h',
         'test/cert_test_util.cc',
         'test/cert_test_util.h',
+        'test/cert_test_util_nss.cc',
         'test/ct_test_util.cc',
         'test/ct_test_util.h',
         'test/embedded_test_server/embedded_test_server.cc',
         '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_http_job.cc',
+        'test/url_request/url_request_mock_http_job.h',
         'url_request/test_url_fetcher_factory.cc',
         'url_request/test_url_fetcher_factory.h',
+        'url_request/test_url_request_interceptor.cc',
+        'url_request/test_url_request_interceptor.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
       ],
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
+        ['use_openssl == 0 and (use_nss == 1 or OS == "ios")', {
           'conditions': [
-            ['use_openssl==1', {
+            [ 'desktop_linux == 1 or chromeos == 1', {
               'dependencies': [
-                '../third_party/openssl/openssl.gyp:openssl',
+                '../build/linux/system.gyp:ssl',
               ],
-            }, {
+            }, {  # desktop_linux == 0 and chromeos == 0
               'dependencies': [
-                '../build/linux/system.gyp:ssl',
+                '../third_party/nss/nss.gyp:nspr',
+                '../third_party/nss/nss.gyp:nss',
+                'third_party/nss/ssl.gyp:libssl',
               ],
             }],
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
-            ['linux_use_tcmalloc==1', {
+            ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             'test/spawned_test_server/spawner_communicator.h',
           ],
         }],
-        ['OS == "ios"', {
-          'dependencies': [
-            '../third_party/nss/nss.gyp:nss',
-          ],
-        }],
         [ 'use_v8_in_net==1', {
             'dependencies': [
               'net_with_v8',
               'dns/mock_mdns_socket_factory.h'
             ]
         }],
+        [ 'use_nss != 1', {
+            'sources!': [
+              'test/cert_test_util_nss.cc',
+            ],
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'net_extras',
+      'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../sql/sql.gyp:sql',
+        'net',
+      ],
+      'sources': [
+        '<@(net_extras_sources)',
+      ],
     },
     {
       'target_name': 'http_server',
       'msvs_disabled_warnings': [4267, ],
     },
     {
+      'target_name': 'balsa',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'net',
+      ],
+      'sources': [
+        'tools/balsa/balsa_enums.h',
+        'tools/balsa/balsa_frame.cc',
+        'tools/balsa/balsa_frame.h',
+        'tools/balsa/balsa_headers.cc',
+        'tools/balsa/balsa_headers.h',
+        'tools/balsa/balsa_headers_token_utils.cc',
+        'tools/balsa/balsa_headers_token_utils.h',
+        'tools/balsa/balsa_visitor_interface.h',
+        'tools/balsa/http_message_constants.cc',
+        'tools/balsa/http_message_constants.h',
+        'tools/balsa/noop_balsa_visitor.h',
+        'tools/balsa/simple_buffer.cc',
+        'tools/balsa/simple_buffer.h',
+        'tools/balsa/split.cc',
+        'tools/balsa/split.h',
+        'tools/balsa/string_piece_utils.h',
+        'tools/quic/spdy_utils.cc',
+        'tools/quic/spdy_utils.h',
+      ],
+    },
+    {
       'target_name': 'dump_cache',
       'type': 'executable',
       'dependencies': [
         'tools/dump_cache/dump_files.h',
         'tools/dump_cache/simple_cache_dumper.cc',
         'tools/dump_cache/simple_cache_dumper.h',
-        'tools/dump_cache/upgrade_win.cc',
-        'tools/dump_cache/upgrade_win.h',
         'tools/dump_cache/url_to_filename_encoder.cc',
         'tools/dump_cache/url_to_filename_encoder.h',
         'tools/dump_cache/url_utilities.h',
       # 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': [
+       '../base/base.gyp:base',
+       '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+       '../url/url.gyp:url_lib',
+       'net',
+      ],
+      'sources': [
+       'quic/quic_dispatcher.cc',
+       'quic/quic_dispatcher.h',
+       'quic/quic_in_memory_cache.cc',
+       'quic/quic_in_memory_cache.h',
+       'quic/quic_per_connection_packet_writer.cc',
+       'quic/quic_per_connection_packet_writer.h',
+       'quic/quic_server.cc',
+       'quic/quic_server.h',
+       'quic/quic_server_packet_writer.cc',
+       'quic/quic_server_packet_writer.h',
+       'quic/quic_server_session.cc',
+       'quic/quic_server_session.h',
+       'quic/quic_spdy_server_stream.cc',
+       'quic/quic_spdy_server_stream.h',
+       'quic/quic_time_wait_list_manager.cc',
+       'quic/quic_time_wait_list_manager.h',
+      ],
+    },
   ],
   'conditions': [
     ['use_v8_in_net == 1', {
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
+            '../gin/gin.gyp:gin',
             '../url/url.gyp:url_lib',
             '../v8/tools/gyp/v8.gyp:v8',
             'net'
         },
       ],
     }],
-    ['OS != "ios"', {
+    ['OS != "ios" and OS != "android"', {
       'targets': [
         # iOS doesn't have the concept of simple executables, these targets
         # can't be compiled on the platform.
           'msvs_disabled_warnings': [4267, ],
         },
         {
-          'target_name': 'fetch_client',
+          'target_name': 'gdig',
           'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '../testing/gtest.gyp:gtest',
+            'net',
+          ],
+          'sources': [
+            'tools/gdig/file_net_log.cc',
+            'tools/gdig/gdig.cc',
+          ],
+        },
+        {
+          'target_name': 'get_server_time',
+          'type': 'executable',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
             '../url/url.gyp:url_lib',
             'net',
-            'net_with_v8',
           ],
           'sources': [
-            'tools/fetch/fetch_client.cc',
+            'tools/get_server_time/get_server_time.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
-          'target_name': 'fetch_server',
+          'target_name': 'hpack_example_generator',
           'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            '../url/url.gyp:url_lib',
             'net',
           ],
           'sources': [
-            'tools/fetch/fetch_server.cc',
-            'tools/fetch/http_listen_socket.cc',
-            'tools/fetch/http_listen_socket.h',
-            'tools/fetch/http_server.cc',
-            'tools/fetch/http_server.h',
-            'tools/fetch/http_server_request_info.cc',
-            'tools/fetch/http_server_request_info.h',
-            'tools/fetch/http_server_response_info.cc',
-            'tools/fetch/http_server_response_info.h',
-            'tools/fetch/http_session.cc',
-            'tools/fetch/http_session.h',
+            'spdy/fuzzing/hpack_example_generator.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
-          'target_name': 'gdig',
+          'target_name': 'hpack_fuzz_mutator',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
           ],
           'sources': [
-            'tools/gdig/file_net_log.cc',
-            'tools/gdig/gdig.cc',
+            'spdy/fuzzing/hpack_fuzz_mutator.cc',
           ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [4267, ],
         },
         {
-          'target_name': 'get_server_time',
+          'target_name': 'hpack_fuzz_wrapper',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../url/url.gyp:url_lib',
             'net',
           ],
           'sources': [
-            'tools/get_server_time/get_server_time.cc',
+            'spdy/fuzzing/hpack_fuzz_wrapper.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
             'net_test_support',
           ],
           'sources': [
-            'disk_cache/stress_cache.cc',
+            'disk_cache/blockfile/stress_cache.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
     ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
       'targets': [
         {
-          'target_name': 'balsa',
-          'type': 'static_library',
-          'dependencies': [
-            '../base/base.gyp:base',
-            'net',
-          ],
-          'sources': [
-            'tools/balsa/balsa_enums.h',
-            'tools/balsa/balsa_frame.cc',
-            'tools/balsa/balsa_frame.h',
-            'tools/balsa/balsa_headers.cc',
-            'tools/balsa/balsa_headers.h',
-            'tools/balsa/balsa_headers_token_utils.cc',
-            'tools/balsa/balsa_headers_token_utils.h',
-            'tools/balsa/balsa_visitor_interface.h',
-            'tools/balsa/http_message_constants.cc',
-            'tools/balsa/http_message_constants.h',
-            'tools/balsa/noop_balsa_visitor.h',
-            'tools/balsa/simple_buffer.cc',
-            'tools/balsa/simple_buffer.h',
-            'tools/balsa/split.cc',
-            'tools/balsa/split.h',
-          ],
-        },
-        {
           'target_name': 'epoll_server',
           'type': 'static_library',
           'dependencies': [
           ],
           'dependencies': [
             '../base/base.gyp:base',
-            '../third_party/openssl/openssl.gyp:openssl',
+            '../third_party/boringssl/boringssl.gyp:boringssl',
             'balsa',
             'epoll_server',
             'net',
             'tools/flip_server/spdy_util.h',
             'tools/flip_server/streamer_interface.cc',
             'tools/flip_server/streamer_interface.h',
-            'tools/flip_server/string_piece_utils.h',
+          ],
+        },
+        {
+          'target_name': 'flip_in_mem_edsm_server_unittests',
+          'type': 'executable',
+          'dependencies': [
+              '../testing/gtest.gyp:gtest',
+              '../testing/gmock.gyp:gmock',
+              '../third_party/boringssl/boringssl.gyp:boringssl',
+              'flip_in_mem_edsm_server_base',
+              'net',
+              'net_test_support',
+          ],
+          'sources': [
+            'tools/flip_server/flip_test_utils.cc',
+            'tools/flip_server/flip_test_utils.h',
+            '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',
           ],
         },
         {
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '../crypto/crypto.gyp:crypto',
-            '../third_party/openssl/openssl.gyp:openssl',
             '../url/url.gyp:url_lib',
             'balsa',
             'epoll_server',
             'tools/quic/quic_epoll_connection_helper.h',
             'tools/quic/quic_in_memory_cache.cc',
             'tools/quic/quic_in_memory_cache.h',
-            'tools/quic/quic_reliable_client_stream.cc',
-            'tools/quic/quic_reliable_client_stream.h',
-            'tools/quic/quic_reliable_server_stream.cc',
-            'tools/quic/quic_reliable_server_stream.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_spdy_server_stream.h',
             'tools/quic/quic_time_wait_list_manager.h',
             'tools/quic/quic_time_wait_list_manager.cc',
-            'tools/quic/spdy_utils.cc',
-            'tools/quic/spdy_utils.h',
           ],
         },
         {
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../third_party/openssl/openssl.gyp:openssl',
             'net',
             'quic_base',
           ],
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../third_party/openssl/openssl.gyp:openssl',
             'net',
-            'quic_base',
+            'quic_tools',
           ],
           'sources': [
-            'tools/quic/quic_server_bin.cc',
+            'quic/quic_server_bin.cc',
           ],
-        }
+        },
       ]
     }],
     ['OS=="android"', {
           'target_name': 'net_jni_headers',
           'type': 'none',
           'sources': [
+            'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
             'android/java/src/org/chromium/net/AndroidKeyStore.java',
             'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
+            'android/java/src/org/chromium/net/AndroidPrivateKey.java',
             'android/java/src/org/chromium/net/GURLUtils.java',
             'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
             'android/java/src/org/chromium/net/ProxyChangeListener.java',
           'variables': {
             'jni_gen_package': 'net',
           },
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/net',
-            ],
-          },
           'includes': [ '../build/jni_generator.gypi' ],
+
+          'conditions': [
+            ['use_icu_alternatives_on_android==1', {
+              'sources': [
+                'android/java/src/org/chromium/net/NetStringUtil.java',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'net_test_jni_headers',
           'variables': {
             'jni_gen_package': 'net',
           },
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/net',
-            ],
-          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           },
           'dependencies': [
             '../base/base.gyp:base',
-            'cert_verify_result_android_java',
+            'cert_verify_status_android_java',
             'certificate_mime_types_java',
             'net_errors_java',
             'private_key_types_java',
+            'remote_android_keystore_aidl',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # Processes the interface files for communication with an Android KeyStore
+          # running in a separate process.
+          'target_name': 'remote_android_keystore_aidl',
+          'type': 'none',
+          'variables': {
+            'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl',
+          },
+          'sources': [
+            '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl',
+            '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl',
+          ],
+          'includes': [ '../build/java_aidl.gypi' ],
+        },
+        {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
         {
           'target_name': 'certificate_mime_types_java',
           'type': 'none',
-          'sources': [
-            'android/java/CertificateMimeType.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['base/mime_util_certificate_type_list.h'],
+            'source_file': 'base/mime_util.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
-          'target_name': 'cert_verify_result_android_java',
+          'target_name': 'cert_verify_status_android_java',
           'type': 'none',
-          'sources': [
-            'android/java/CertVerifyResultAndroid.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['android/cert_verify_result_android_list.h'],
+            'source_file': 'android/cert_verify_result_android.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'private_key_types_java',
           'type': 'none',
-          'sources': [
-            'android/java/PrivateKeyType.template',
-          ],
           'variables': {
-            'package_name': 'org/chromium/net',
-            'template_deps': ['android/private_key_type_list.h'],
+            'source_file': 'android/keystore.h',
           },
-          'includes': [ '../build/android/java_cpp_template.gypi' ],
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
-      ],
-    }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # net_unittests into an android apk for execution.
-    # See base.gyp for TODO(jrg)s about this strategy.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
-      'targets': [
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
           ],
           'variables': {
             'test_suite_name': 'net_unittests',
-            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)',
+            'conditions': [
+              ['v8_use_external_startup_data==1', {
+                'additional_input_paths': [
+                  '<(PRODUCT_DIR)/natives_blob.bin',
+                  '<(PRODUCT_DIR)/snapshot_blob.bin',
+                ],
+                'copies': [
+                  {
+                  'destination': '<(PRODUCT_DIR)/net_unittests_apk/assets',
+                    'files': [
+                      '<(PRODUCT_DIR)/natives_blob.bin',
+                      '<(PRODUCT_DIR)/snapshot_blob.bin',
+                    ],
+                  },
+                ],
+              }],
+            ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
           ],
           'includes': [
             '../build/isolate.gypi',
-            'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',