Update from https://crrev.com/304121

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 998 matching lines @@
       'socket/unix_domain_listen_socket_posix.cc',
       'socket/unix_domain_listen_socket_posix.h',
       'socket/unix_domain_server_socket_posix.cc',
       'socket/unix_domain_server_socket_posix.h',
       'socket/websocket_endpoint_lock_manager.cc',
       'socket/websocket_endpoint_lock_manager.h',
       'socket/websocket_transport_client_socket_pool.cc',
       'socket/websocket_transport_client_socket_pool.h',
       'socket/websocket_transport_connect_sub_job.cc',
       'socket/websocket_transport_connect_sub_job.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/fuzzing/hpack_fuzz_util.cc',
       'spdy/fuzzing/hpack_fuzz_util.h',
       'spdy/hpack_constants.cc',
       'spdy/hpack_constants.h',
       'spdy/hpack_decoder.cc',
       'spdy/hpack_decoder.h',
       'spdy/hpack_encoder.cc',
       'spdy/hpack_encoder.h',
@@ skipping 45 matching lines @@
       '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_chromeos.cc',
       'ssl/client_cert_store_chromeos.h',
       'ssl/client_cert_store_mac.cc',
       'ssl/client_cert_store_mac.h',
       'ssl/client_cert_store_nss.cc',
       'ssl/client_cert_store_nss.h',
@@ skipping 138 matching lines @@
       'websockets/websocket_handshake_handler.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_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_extras_sources': [
       'extras/sqlite/sqlite_channel_id_store.cc',
       'extras/sqlite/sqlite_channel_id_store.h',
     ],
     'net_test_sources': [
       'android/keystore_unittest.cc',
       'android/network_change_notifier_android_unittest.cc',
       'base/address_list_unittest.cc',
       'base/address_tracker_linux_unittest.cc',
@@ skipping 335 matching lines @@
       'socket/tcp_socket_unittest.cc',
       'socket/transport_client_socket_pool_test_util.cc',
       'socket/transport_client_socket_pool_test_util.h',
       'socket/transport_client_socket_pool_unittest.cc',
       'socket/transport_client_socket_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',
       'socket/websocket_endpoint_lock_manager_unittest.cc',
       'socket/websocket_transport_client_socket_pool_unittest.cc',
-      'socket_stream/socket_stream_metrics_unittest.cc',
-      'socket_stream/socket_stream_unittest.cc',
       'spdy/buffered_spdy_framer_unittest.cc',
       'spdy/fuzzing/hpack_fuzz_util_test.cc',
       'spdy/hpack_decoder_test.cc',
       'spdy/hpack_encoder_test.cc',
       'spdy/hpack_entry_test.cc',
       'spdy/hpack_header_table_test.cc',
       'spdy/hpack_huffman_aggregator_test.cc',
       'spdy/hpack_huffman_table_test.cc',
       'spdy/hpack_input_stream_test.cc',
       'spdy/hpack_output_stream_test.cc',
@@ skipping 22 matching lines @@
       '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/channel_id_service_unittest.cc',
       'ssl/client_cert_store_chromeos_unittest.cc',
       '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',
@@ skipping 42 matching lines @@
       '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_spdy_test.cc',
       'websockets/websocket_handshake_handler_test.cc',
       'websockets/websocket_handshake_stream_create_helper_test.cc',
       'websockets/websocket_inflater_test.cc',
-      'websockets/websocket_job_test.cc',
-      'websockets/websocket_net_log_params_test.cc',
       'websockets/websocket_stream_test.cc',
       'websockets/websocket_test_util.cc',
       'websockets/websocket_test_util.h',
-      'websockets/websocket_throttle_test.cc',
     ],
     '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_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_server_session_test.cc',
@@ skipping 21 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',
     ],
   }
 }