Update from chromium https://crrev.com/302282

net/net.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 59 matching lines @@
       'cert/cert_verifier.h',
       'cert/cert_verify_result.cc',
       'cert/cert_verify_result.h',
       'cert/crl_set.cc',
       'cert/crl_set.h',
       'cert/ct_verifier.h',
       'cert/ct_verify_result.cc',
       'cert/ct_verify_result.h',
       'cert/pem_tokenizer.cc',
       'cert/pem_tokenizer.h',
+      'cert/sha256_legacy_support_nss_win.cc',
+      'cert/sha256_legacy_support_openssl_win.cc',
       'cert/sha256_legacy_support_win.cc',
       'cert/sha256_legacy_support_win.h',
       'cert/signed_certificate_timestamp.cc',
       'cert/signed_certificate_timestamp.h',
       'cert/single_request_cert_verifier.cc',
       'cert/single_request_cert_verifier.h',
       'cert/signed_tree_head.h',
       'cert/x509_cert_types.cc',
       'cert/x509_cert_types.h',
       'cert/x509_certificate.cc',
@@ skipping 142 matching lines @@
       'base/linked_hash_map.h',
       'base/load_flags.h',
       'base/load_flags_list.h',
       'base/load_states.h',
       'base/load_states_list.h',
       'base/mime_sniffer.cc',
       'base/mime_sniffer.h',
       'base/mime_util.cc',
       'base/mime_util.h',
       'base/net_errors_win.cc',
+      'base/net_info_source_list.h',
       'base/net_log_logger.cc',
       'base/net_log_logger.h',
+      'base/net_log_util.cc',
+      'base/net_log_util.h',
       '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',
@@ skipping 220 matching lines @@
       '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_posix.cc',
+      'disk_cache/simple/simple_util_win.cc',
       'disk_cache/simple/simple_util.h',
       'disk_cache/simple/simple_version_upgrade.cc',
       'disk_cache/simple/simple_version_upgrade.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',
@@ skipping 250 matching lines @@
       'quic/congestion_control/cubic.cc',
       'quic/congestion_control/cubic.h',
       'quic/congestion_control/hybrid_slow_start.cc',
       'quic/congestion_control/hybrid_slow_start.h',
       'quic/congestion_control/leaky_bucket.cc',
       'quic/congestion_control/leaky_bucket.h',
       'quic/congestion_control/loss_detection_interface.cc',
       'quic/congestion_control/loss_detection_interface.h',
       'quic/congestion_control/pacing_sender.cc',
       'quic/congestion_control/pacing_sender.h',
+      'quic/congestion_control/prr_sender.cc',
+      'quic/congestion_control/prr_sender.h',
       'quic/congestion_control/receive_algorithm_interface.cc',
       'quic/congestion_control/receive_algorithm_interface.h',
       'quic/congestion_control/rtt_stats.cc',
       'quic/congestion_control/rtt_stats.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_loss_algorithm.cc',
       'quic/congestion_control/tcp_loss_algorithm.h',
@@ skipping 508 matching lines @@
       'base/host_port_pair_unittest.cc',
       'base/int128_unittest.cc',
       'base/ip_endpoint_unittest.cc',
       'base/ip_pattern_unittest.cc',
       'base/keygen_handler_unittest.cc',
       'base/mime_sniffer_unittest.cc',
       'base/mime_util_unittest.cc',
       'base/net_log_logger_unittest.cc',
       'base/net_log_unittest.cc',
       'base/net_log_unittest.h',
+      'base/net_log_util_unittest.cc',
       'base/net_util_unittest.cc',
       'base/net_util_icu_unittest.cc',
       'base/network_change_notifier_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_dictionary_fetcher_unittest.cc',
       'base/sdch_manager_unittest.cc',
       'base/static_cookie_policy_unittest.cc',
@@ skipping 149 matching lines @@
       '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/cube_root_test.cc',
       'quic/congestion_control/cubic_test.cc',
       'quic/congestion_control/hybrid_slow_start_test.cc',
       'quic/congestion_control/leaky_bucket_test.cc',
       'quic/congestion_control/pacing_sender_test.cc',
+      'quic/congestion_control/prr_sender_test.cc',
       'quic/congestion_control/rtt_stats_test.cc',
       'quic/congestion_control/send_algorithm_simulator.cc',
       'quic/congestion_control/send_algorithm_simulator.h',
       'quic/congestion_control/tcp_cubic_sender_test.cc',
       'quic/congestion_control/tcp_loss_algorithm_test.cc',
       'quic/congestion_control/tcp_receiver_test.cc',
       'quic/congestion_control/time_loss_algorithm_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',
@@ skipping 293 matching lines @@
       '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',
       'tools/quic/test_tools/simple_client.h',
       'tools/quic/test_tools/simple_client.cc',
     ],
   }
 }