Update from https://crrev.com/316786

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).
     # These files must not depend on files listed in sources list in the net
     # target.
     'net_nacl_common_sources' : [
       'base/address_family.h',
       'base/address_list.cc',
       'base/address_list.h',
       'base/auth.cc',
       'base/auth.h',
       'base/completion_callback.h',
       'base/connection_type_histograms.cc',
       'base/connection_type_histograms.h',
       'base/dns_util.cc',
       'base/dns_util.h',
       'base/escape.cc',
       'base/escape.h',
       'base/hash_value.cc',
       'base/hash_value.h',
-      'base/load_timing_info.cc',
-      'base/load_timing_info.h',
       'base/host_port_pair.cc',
       'base/host_port_pair.h',
       'base/io_buffer.cc',
       'base/io_buffer.h',
       'base/ip_endpoint.cc',
       'base/ip_endpoint.h',
+      'base/load_timing_info.cc',
+      'base/load_timing_info.h',
       'base/net_error_list.h',
       'base/net_errors.cc',
       'base/net_errors.h',
       'base/net_errors_posix.cc',
       'base/net_export.h',
       'base/net_log.cc',
       'base/net_log.h',
       'base/net_log_event_type_list.h',
       'base/net_log_source_type_list.h',
       'base/net_module.cc',
@@ skipping 32 matching lines @@
       '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/signed_tree_head.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',
       'cert/x509_certificate.h',
       'cert/x509_certificate_net_log_param.cc',
       'cert/x509_certificate_net_log_param.h',
       'cert/x509_certificate_openssl.cc',
       'cert/x509_util.cc',
       'cert/x509_util.h',
       'cert/x509_util_openssl.cc',
@@ skipping 58 matching lines @@
       'ssl/ssl_client_auth_cache.h',
       'ssl/ssl_client_cert_type.h',
       'ssl/ssl_config.cc',
       'ssl/ssl_config.h',
       'ssl/ssl_config_service.cc',
       'ssl/ssl_config_service.h',
       'ssl/ssl_info.cc',
       'ssl/ssl_info.h',
     ],
     'net_non_nacl_sources': [
+      'android/android_private_key.cc',
+      'android/android_private_key.h',
       'android/cert_verify_result_android.cc',
       'android/cert_verify_result_android.h',
       'android/cert_verify_status_android_list.h',
       'android/gurl_utils.cc',
       'android/gurl_utils.h',
-      'android/android_private_key.cc',
-      'android/android_private_key.h',
       'android/keystore.cc',
       'android/keystore.h',
       'android/keystore_openssl.cc',
       'android/keystore_openssl.h',
       'android/legacy_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',
@@ skipping 42 matching lines @@
       'base/int128.h',
       'base/iovec.h',
       'base/ip_pattern.cc',
       'base/ip_pattern.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',
+      # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
+      'base/layered_network_delegate.cc',
+      'base/layered_network_delegate.h',
       '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',
@@ skipping 18 matching lines @@
       '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_delegate_impl.cc',
       'base/network_delegate_impl.h',
       'base/nss_memio.c',
       'base/nss_memio.h',
       '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/proxy_delegate.h',
       'base/request_priority.cc',
       'base/request_priority.h',
       'base/sdch_manager.cc',
@@ skipping 18 matching lines @@
       '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/layered_network_delegate.cc',
-      'base/layered_network_delegate.h',
       'cert/cert_database_android.cc',
       'cert/cert_database_ios.cc',
       'cert/cert_database_mac.cc',
       'cert/cert_database_nss.cc',
       'cert/cert_database_win.cc',
       'cert/cert_trust_anchor_provider.h',
       'cert/cert_verify_proc.cc',
       'cert/cert_verify_proc.h',
       'cert/cert_verify_proc_android.cc',
       'cert/cert_verify_proc_android.h',
@@ skipping 168 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.h',
       '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',
       'dns/dns_config_service.h',
@@ skipping 235 matching lines @@
       '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/cube_root.cc',
-      'quic/congestion_control/cube_root.h',
       '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/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',
-      'quic/congestion_control/tcp_receiver.cc',
-      'quic/congestion_control/tcp_receiver.h',
       'quic/congestion_control/time_loss_algorithm.cc',
       'quic/congestion_control/time_loss_algorithm.h',
       'quic/crypto/aead_base_decrypter.h',
       'quic/crypto/aead_base_decrypter_nss.cc',
       'quic/crypto/aead_base_decrypter_openssl.cc',
       'quic/crypto/aead_base_encrypter.h',
       'quic/crypto/aead_base_encrypter_nss.cc',
       'quic/crypto/aead_base_encrypter_openssl.cc',
       'quic/crypto/aes_128_gcm_12_decrypter.h',
       'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
@@ skipping 437 matching lines @@
       'websockets/websocket_errors.cc',
       'websockets/websocket_errors.h',
       'websockets/websocket_extension.cc',
       'websockets/websocket_extension.h',
       'websockets/websocket_extension_parser.cc',
       'websockets/websocket_extension_parser.h',
       'websockets/websocket_frame.cc',
       'websockets/websocket_frame.h',
       'websockets/websocket_frame_parser.cc',
       'websockets/websocket_frame_parser.h',
+      'websockets/websocket_handshake_challenge.cc',
+      'websockets/websocket_handshake_challenge.h',
       'websockets/websocket_handshake_constants.cc',
       'websockets/websocket_handshake_constants.h',
-      'websockets/websocket_handshake_challenge.cc',
-      'websockets/websocket_handshake_challenge.h',
       'websockets/websocket_handshake_request_info.cc',
       'websockets/websocket_handshake_request_info.h',
       'websockets/websocket_handshake_response_info.cc',
       'websockets/websocket_handshake_response_info.h',
       'websockets/websocket_handshake_stream_base.h',
       'websockets/websocket_handshake_stream_create_helper.cc',
       'websockets/websocket_handshake_stream_create_helper.h',
       'websockets/websocket_inflater.cc',
       'websockets/websocket_inflater.h',
       'websockets/websocket_mux.h',
@@ skipping 18 matching lines @@
       'base/escape_unittest.cc',
       'base/expiring_cache_unittest.cc',
       'base/file_stream_unittest.cc',
       'base/filename_util_unittest.cc',
       'base/host_mapping_rules_unittest.cc',
       '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/layered_network_delegate_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_icu_unittest.cc',
       'base/net_util_unittest.cc',
-      'base/net_util_icu_unittest.cc',
       'base/network_activity_monitor_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_manager_unittest.cc',
       'base/static_cookie_policy_unittest.cc',
       'base/test_completion_callback_unittest.cc',
       'base/trace_net_log_observer_unittest.cc',
       'base/upload_bytes_element_reader_unittest.cc',
       'base/upload_file_element_reader_unittest.cc',
       'base/url_util_unittest.cc',
-      'base/layered_network_delegate_unittest.cc',
       'cert/cert_policy_enforcer_unittest.cc',
       'cert/cert_verify_proc_unittest.cc',
       'cert/crl_set_unittest.cc',
       'cert/ct_log_response_parser_unittest.cc',
       'cert/ct_log_verifier_unittest.cc',
       'cert/ct_objects_extractor_unittest.cc',
       'cert/ct_serialization_unittest.cc',
       'cert/ev_root_ca_metadata_unittest.cc',
       'cert/jwk_serializer_unittest.cc',
       'cert/multi_log_ct_verifier_unittest.cc',
@@ skipping 40 matching lines @@
       '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/mojo_host_resolver_impl_unittest.cc',
       'dns/record_parsed_unittest.cc',
       'dns/record_rdata_unittest.cc',
       'dns/serial_worker_unittest.cc',
       'dns/single_request_host_resolver_unittest.cc',
       'extras/sqlite/sqlite_channel_id_store_unittest.cc',
       'filter/filter_unittest.cc',
       'filter/gzip_filter_unittest.cc',
       'filter/mock_filter_context.cc',
       'filter/mock_filter_context.h',
       'filter/sdch_filter_unittest.cc',
@@ skipping 71 matching lines @@
       '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/cube_root_test.cc',
       'quic/congestion_control/cubic_test.cc',
       'quic/congestion_control/hybrid_slow_start_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',
       'quic/crypto/chacha20_poly1305_decrypter_test.cc',
       'quic/crypto/chacha20_poly1305_encrypter_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/local_strike_register_client_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_client_config_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/port_suggester_unittest.cc',
+      'quic/quic_ack_notifier_test.cc',
+      'quic/quic_address_mismatch_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_logger_unittest.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_stream_test.cc',
+      'quic/quic_data_writer_test.cc',
+      'quic/quic_fec_group_test.cc',
+      'quic/quic_flow_controller_test.cc',
+      'quic/quic_framer_test.cc',
+      'quic/quic_headers_stream_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_server_id_test.cc',
+      'quic/quic_server_test.cc',
+      'quic/quic_session_test.cc',
+      'quic/quic_socket_address_coder_test.cc',
+      'quic/quic_stream_factory_test.cc',
+      'quic/quic_stream_sequencer_test.cc',
+      'quic/quic_sustained_bandwidth_recorder_test.cc',
+      'quic/quic_time_test.cc',
+      'quic/quic_unacked_packet_map_test.cc',
+      'quic/quic_utils_chromium_test.cc',
+      'quic/quic_utils_test.cc',
+      'quic/quic_write_blocked_list_test.cc',
+      'quic/reliable_quic_stream_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/delayed_verify_strike_register_client.cc',
       'quic/test_tools/delayed_verify_strike_register_client.h',
       'quic/test_tools/mock_clock.cc',
       'quic/test_tools/mock_clock.h',
       'quic/test_tools/mock_crypto_client_stream.cc',
@@ skipping 33 matching lines @@
       'quic/test_tools/quic_test_packet_maker.cc',
       'quic/test_tools/quic_test_packet_maker.h',
       'quic/test_tools/quic_test_utils.cc',
       'quic/test_tools/quic_test_utils.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_address_mismatch_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_logger_unittest.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_stream_test.cc',
-      'quic/quic_data_writer_test.cc',
-      'quic/quic_fec_group_test.cc',
-      'quic/quic_flow_controller_test.cc',
-      'quic/quic_framer_test.cc',
-      'quic/quic_headers_stream_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_server_id_test.cc',
-      'quic/quic_server_test.cc',
-      'quic/quic_session_test.cc',
-      'quic/quic_socket_address_coder_test.cc',
-      'quic/quic_stream_factory_test.cc',
-      'quic/quic_stream_sequencer_test.cc',
-      'quic/quic_sustained_bandwidth_recorder_test.cc',
-      'quic/quic_time_test.cc',
-      'quic/quic_unacked_packet_map_test.cc',
-      'quic/quic_utils_chromium_test.cc',
-      'quic/quic_utils_test.cc',
-      'quic/quic_write_blocked_list_test.cc',
-      'quic/reliable_quic_stream_test.cc',
       'sdch/sdch_owner_unittest.cc',
       'server/http_connection_unittest.cc',
       'server/http_server_response_info_unittest.cc',
       'server/http_server_unittest.cc',
       'server/web_socket_encoder_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',
@@ skipping 67 matching lines @@
       'ssl/client_cert_store_mac_unittest.cc',
       'ssl/client_cert_store_nss_unittest.cc',
       'ssl/client_cert_store_unittest-inl.h',
       'ssl/client_cert_store_win_unittest.cc',
       'ssl/default_channel_id_store_unittest.cc',
       'ssl/openssl_client_key_store_unittest.cc',
       'ssl/ssl_cipher_suite_names_unittest.cc',
       'ssl/ssl_client_auth_cache_unittest.cc',
       'ssl/ssl_config_service_unittest.cc',
       'ssl/ssl_connection_status_flags_unittest.cc',
-      'test/gtest_util.h',
       '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/gtest_util.h',
       'test/python_utils_unittest.cc',
       'test/run_all_unittests.cc',
       'test/scoped_disable_exit_on_dfatal.cc',
       'test/scoped_disable_exit_on_dfatal.h',
       'test/scoped_mock_log.cc',
       'test/scoped_mock_log.h',
       'test/test_certificate_data.h',
       'tools/balsa/balsa_frame_test.cc',
       'tools/balsa/balsa_headers_test.cc',
       '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.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/sdch_dictionary_fetcher_unittest.cc',
       'url_request/url_fetcher_impl_unittest.cc',
       'url_request/url_fetcher_response_writer_unittest.cc',
       'url_request/url_request_context_builder_unittest.cc',
       'url_request/url_request_data_job_unittest.cc',
       'url_request/url_request_file_job_unittest.cc',
       'url_request/url_request_filter_unittest.cc',
@@ skipping 14 matching lines @@
       'websockets/websocket_deflate_stream_test.cc',
       'websockets/websocket_deflater_test.cc',
       'websockets/websocket_end_to_end_test.cc',
       'websockets/websocket_errors_test.cc',
       'websockets/websocket_extension_parser_test.cc',
       'websockets/websocket_frame_parser_test.cc',
       'websockets/websocket_frame_test.cc',
       'websockets/websocket_handshake_challenge_test.cc',
       'websockets/websocket_handshake_stream_create_helper_test.cc',
       'websockets/websocket_inflater_test.cc',
+      'websockets/websocket_stream_cookie_test.cc',
+      'websockets/websocket_stream_create_test_base.cc',
+      'websockets/websocket_stream_create_test_base.h',
       'websockets/websocket_stream_test.cc',
       'websockets/websocket_test_util.cc',
       'websockets/websocket_test_util.h',
     ],
     'net_linux_test_sources': [
       'quic/quic_end_to_end_unittest.cc',
       'tools/quic/end_to_end_test.cc',
       'tools/quic/quic_client_session_test.cc',
       'tools/quic/quic_client_test.cc',
       'tools/quic/quic_dispatcher_test.cc',
@@ skipping 10 matching lines @@
       '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.cc',
       '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.cc',
       'tools/quic/test_tools/server_thread.h',
-      'tools/quic/test_tools/server_thread.cc',
+      'tools/quic/test_tools/simple_client.cc',
       'tools/quic/test_tools/simple_client.h',
-      'tools/quic/test_tools/simple_client.cc',
     ],
     'net_base_mac_ios_sources': [
       'base/mac/url_conversions.h',
       'base/mac/url_conversions.mm',
     ],
     'net_base_test_mac_ios_sources': [
       'base/mac/url_conversions_unittest.mm',
     ],
   }
 }