net: move udp directory into socket

net/net.gypi

Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index 80dd53f823464d86f2cce9c4bf869346717d3196..8d879a3d62e1d3581911f10764f0ee50a49347fc 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -136,8 +136,8 @@
       'cert/ocsp_verify_result.h',
       'cert/pem_tokenizer.cc',
       'cert/pem_tokenizer.h',
-      'cert/sct_status_flags.h',
       'cert/sct_status_flags.cc',
+      'cert/sct_status_flags.h',
       'cert/signed_certificate_timestamp.cc',
       'cert/signed_certificate_timestamp.h',
       'cert/signed_certificate_timestamp_and_status.cc',
@@ -159,10 +159,10 @@
       'cert/x509_util.h',
       'cert/x509_util_openssl.cc',
       'cert/x509_util_openssl.h',
-      'der/input.cc',
-      'der/input.h',
       'der/encode_values.cc',
       'der/encode_values.h',
+      'der/input.cc',
+      'der/input.h',
       'der/parse_values.cc',
       'der/parse_values.h',
       'der/parser.cc',
@@ -197,16 +197,16 @@
       'http/transport_security_state.h',
       'log/net_log.cc',
       'log/net_log.h',
+      'log/net_log_capture_mode.cc',
+      'log/net_log_capture_mode.h',
       'log/net_log_entry.cc',
       'log/net_log_entry.h',
+      'log/net_log_event_type_list.h',
       'log/net_log_source.cc',
       'log/net_log_source.h',
+      'log/net_log_source_type_list.h',
       'log/net_log_with_source.cc',
       'log/net_log_with_source.h',
-      'log/net_log_capture_mode.cc',
-      'log/net_log_capture_mode.h',
-      'log/net_log_event_type_list.h',
-      'log/net_log_source_type_list.h',
       'socket/client_socket_handle.cc',
       'socket/client_socket_handle.h',
       'socket/connection_attempts.h',
@@ -479,8 +479,8 @@
       'cert/x509_util_android.h',
       'cert/x509_util_mac.cc',
       'cert/x509_util_mac.h',
-      'cert/x509_util_nss.h',
       'cert/x509_util_nss.cc',
+      'cert/x509_util_nss.h',
       'cert_net/cert_net_fetcher_impl.cc',
       'cert_net/cert_net_fetcher_impl.h',
       'cookies/canonical_cookie.cc',
@@ -569,14 +569,14 @@
       'disk_cache/simple/simple_entry_operation.h',
       'disk_cache/simple/simple_experiment.cc',
       'disk_cache/simple/simple_experiment.h',
+      'log/bounded_file_net_log_observer.cc',
+      'log/bounded_file_net_log_observer.h',
       'log/net_log_util.cc',
       'log/net_log_util.h',
       'log/trace_net_log_observer.cc',
       'log/trace_net_log_observer.h',
       'log/write_to_file_net_log_observer.cc',
       'log/write_to_file_net_log_observer.h',
-      'log/bounded_file_net_log_observer.cc',
-      'log/bounded_file_net_log_observer.h',
       'disk_cache/simple/simple_histogram_macros.h' ,
       'cert_net/nss_ocsp.cc',
       'cert_net/nss_ocsp.h',
@@ -656,10 +656,10 @@
       'filter/gzip_header.h',
       'filter/gzip_source_stream.cc',
       'filter/gzip_source_stream.h',
-      'filter/sdch_source_stream.cc',
-      'filter/sdch_source_stream.h',
       'filter/sdch_policy_delegate.cc',
       'filter/sdch_policy_delegate.h',
+      'filter/sdch_source_stream.cc',
+      'filter/sdch_source_stream.h',
       'filter/source_stream.cc',
       'filter/source_stream.h',
       'filter/source_stream_type_list.h',
@@ -870,10 +870,10 @@
       'quic/chromium/crypto/proof_source_chromium.h',
       'quic/chromium/crypto/proof_verifier_chromium.cc',
       'quic/chromium/crypto/proof_verifier_chromium.h',
-      'quic/chromium/quic_stream_factory.cc',
-      'quic/chromium/quic_stream_factory.h',
-      'quic/chromium/quic_http_stream.cc',
-      'quic/chromium/quic_http_stream.h',
+      'quic/chromium/network_connection.cc',
+      'quic/chromium/network_connection.h',
+      'quic/chromium/port_suggester.cc',
+      'quic/chromium/port_suggester.h',
       'quic/chromium/quic_chromium_alarm_factory.cc',
       'quic/chromium/quic_chromium_alarm_factory.h',
       'quic/chromium/quic_chromium_client_session.cc',
@@ -886,15 +886,15 @@
       'quic/chromium/quic_chromium_packet_reader.h',
       'quic/chromium/quic_chromium_packet_writer.cc',
       'quic/chromium/quic_chromium_packet_writer.h',
-      'quic/chromium/quic_clock_skew_detector.h',
       'quic/chromium/quic_clock_skew_detector.cc',
+      'quic/chromium/quic_clock_skew_detector.h',
       'quic/chromium/quic_connection_logger.cc',
       'quic/chromium/quic_connection_logger.h',
+      'quic/chromium/quic_http_stream.cc',
+      'quic/chromium/quic_http_stream.h',
+      'quic/chromium/quic_stream_factory.cc',
+      'quic/chromium/quic_stream_factory.h',
       'quic/chromium/quic_utils_chromium.h',
-      'quic/chromium/network_connection.cc',
-      'quic/chromium/network_connection.h',
-      'quic/chromium/port_suggester.cc',
-      'quic/chromium/port_suggester.h',
       'quic/core/congestion_control/bandwidth_sampler.cc',
       'quic/core/congestion_control/bandwidth_sampler.h',
       'quic/core/congestion_control/bbr_sender.cc',
@@ -1066,6 +1066,8 @@
       'quic/core/quic_sent_packet_manager_interface.h',
       'quic/core/quic_server_id.cc',
       'quic/core/quic_server_id.h',
+      'quic/core/quic_server_session_base.cc',
+      'quic/core/quic_server_session_base.h',
       'quic/core/quic_session.cc',
       'quic/core/quic_session.h',
       'quic/core/quic_simple_buffer_allocator.cc',
@@ -1076,6 +1078,8 @@
       'quic/core/quic_spdy_session.h',
       'quic/core/quic_spdy_stream.cc',
       'quic/core/quic_spdy_stream.h',
+      'quic/core/quic_stream.cc',
+      'quic/core/quic_stream.h',
       'quic/core/quic_stream_sequencer.cc',
       'quic/core/quic_stream_sequencer.h',
       'quic/core/quic_stream_sequencer_buffer.cc',
@@ -1093,10 +1097,6 @@
       'quic/core/quic_utils.h',
       'quic/core/quic_write_blocked_list.cc',
       'quic/core/quic_write_blocked_list.h',
-      'quic/core/quic_stream.cc',
-      'quic/core/quic_stream.h',
-      'quic/core/quic_server_session_base.cc',
-      'quic/core/quic_server_session_base.h',
       'quic/core/spdy_utils.cc',
       'quic/core/spdy_utils.h',
       'quic/quartc/quartc_alarm_factory.cc',
@@ -1124,6 +1124,10 @@
       'socket/client_socket_pool_manager.h',
       'socket/client_socket_pool_manager_impl.cc',
       'socket/client_socket_pool_manager_impl.h',
+      'socket/datagram_client_socket.h',
+      'socket/datagram_server_socket.h',
+      'socket/datagram_socket.h',
+      'socket/diff_serv_code_point.h',
       'socket/server_socket.cc',
       'socket/server_socket.h',
       'socket/socket_descriptor.cc',
@@ -1157,6 +1161,17 @@
       'socket/tcp_socket_win.h',
       'socket/transport_client_socket_pool.cc',
       'socket/transport_client_socket_pool.h',
+      'socket/udp_client_socket.cc',
+      'socket/udp_client_socket.h',
+      'socket/udp_net_log_parameters.cc',
+      'socket/udp_net_log_parameters.h',
+      'socket/udp_server_socket.cc',
+      'socket/udp_server_socket.h',
+      'socket/udp_socket.h',
+      'socket/udp_socket_posix.cc',
+      'socket/udp_socket_posix.h',
+      'socket/udp_socket_win.cc',
+      'socket/udp_socket_win.h',
       'socket/unix_domain_client_socket_posix.cc',
       'socket/unix_domain_client_socket_posix.h',
       'socket/unix_domain_server_socket_posix.cc',
@@ -1196,9 +1211,9 @@
       'spdy/hpack/hpack_output_stream.h',
       'spdy/hpack/hpack_static_table.cc',
       'spdy/hpack/hpack_static_table.h',
-      'spdy/http2_write_scheduler.h',
-      'spdy/http2_priority_dependencies.h',
       'spdy/http2_priority_dependencies.cc',
+      'spdy/http2_priority_dependencies.h',
+      'spdy/http2_write_scheduler.h',
       'spdy/priority_write_scheduler.h',
       'spdy/server_push_delegate.h',
       'spdy/spdy_alt_svc_wire_format.cc',
@@ -1280,21 +1295,6 @@
       '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/diff_serv_code_point.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_posix.cc',
-      'udp/udp_socket_posix.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/http_user_agent_settings.h',
@@ -1370,6 +1370,8 @@
       'url_request/websocket_handshake_userdata_key.cc',
       'url_request/websocket_handshake_userdata_key.h',
 
+      'websockets/websocket_handshake_request_info.h',
+      'websockets/websocket_handshake_response_info.h',
       # WebSockets headers are included net/http files. Since net/http can be
       # built without linking net/websockets code, the uses of the websockets
       # headers from url_request are carefully written not to introduce link-
@@ -1380,8 +1382,6 @@
       # unconditionally here from the conditional websockets list below.
       'websockets/websocket_handshake_stream_base.h',
       'websockets/websocket_stream.h',
-      'websockets/websocket_handshake_request_info.h',
-      'websockets/websocket_handshake_response_info.h',
     ],
     'net_extras_sources': [
       'extras/sqlite/cookie_crypto_delegate.h',
@@ -1443,15 +1443,16 @@
       'base/upload_file_element_reader_unittest.cc',
       'base/url_util_unittest.cc',
       'cert/caching_cert_verifier_unittest.cc',
-      'cert/ct_known_logs_unittest.cc',
-      'cert/ct_policy_enforcer_unittest.cc',
       'cert/cert_verifier_unittest.cc',
+      'cert/cert_verify_proc_ios_unittest.cc',
       'cert/cert_verify_proc_unittest.cc',
       'cert/cert_verify_proc_whitelist_unittest.cc',
       'cert/crl_set_unittest.cc',
+      'cert/ct_known_logs_unittest.cc',
       'cert/ct_log_response_parser_unittest.cc',
       'cert/ct_log_verifier_unittest.cc',
       'cert/ct_objects_extractor_unittest.cc',
+      'cert/ct_policy_enforcer_unittest.cc',
       'cert/ct_serialization_unittest.cc',
       'cert/ev_root_ca_metadata_unittest.cc',
       'cert/internal/cert_issuer_source_aia_unittest.cc',
@@ -1487,7 +1488,6 @@
       'cert/nss_cert_database_unittest.cc',
       'cert/nss_profile_filter_chromeos_unittest.cc',
       'cert/pem_tokenizer_unittest.cc',
-      'cert/cert_verify_proc_ios_unittest.cc',
       'cert/signed_certificate_timestamp_unittest.cc',
       'cert/sth_distributor_unittest.cc',
       'cert/test_root_certs_unittest.cc',
@@ -1502,8 +1502,8 @@
       'cookies/cookie_store_unittest.cc',
       'cookies/cookie_util_unittest.cc',
       'cookies/parsed_cookie_unittest.cc',
-      'der/input_unittest.cc',
       'der/encode_values_unittest.cc',
+      'der/input_unittest.cc',
       'der/parse_values_unittest.cc',
       'der/parser_unittest.cc',
       'disk_cache/backend_unittest.cc',
@@ -1616,12 +1616,12 @@
       'http/transport_security_persister_unittest.cc',
       'http/transport_security_state_unittest.cc',
       'http/url_security_manager_unittest.cc',
+      'log/bounded_file_net_log_observer_unittest.cc',
       'log/net_log_capture_mode_unittest.cc',
       'log/net_log_unittest.cc',
       'log/net_log_util_unittest.cc',
       'log/trace_net_log_observer_unittest.cc',
       'log/write_to_file_net_log_observer_unittest.cc',
-      'log/bounded_file_net_log_observer_unittest.cc',
       'nqe/effective_connection_type_unittest.cc',
       'nqe/network_qualities_prefs_manager_unittest.cc',
       'nqe/network_quality_estimator_unittest.cc',
@@ -1653,9 +1653,9 @@
       'proxy/proxy_service_mojo_unittest.cc',
       'proxy/proxy_service_unittest.cc',
       'quic/chromium/bidirectional_stream_quic_impl_unittest.cc',
+      'quic/chromium/crypto/proof_test_chromium.cc',
       'quic/chromium/crypto/proof_verifier_chromium_test.cc',
       'quic/chromium/crypto_test_utils_chromium.cc',
-      'quic/chromium/crypto/proof_test_chromium.cc',
       'quic/chromium/mock_network_change_notifier.cc',
       'quic/chromium/mock_network_change_notifier.h',
       'quic/chromium/mock_quic_data.cc',
@@ -1663,6 +1663,8 @@
       'quic/chromium/network_connection_unittest.cc',
       'quic/chromium/port_suggester_unittest.cc',
       'quic/chromium/quic_chromium_alarm_factory_test.cc',
+      'quic/chromium/quic_chromium_client_session_peer.cc',
+      'quic/chromium/quic_chromium_client_session_peer.h',
       'quic/chromium/quic_chromium_client_session_test.cc',
       'quic/chromium/quic_chromium_client_stream_test.cc',
       'quic/chromium/quic_chromium_connection_helper_test.cc',
@@ -1672,8 +1674,6 @@
       'quic/chromium/quic_network_transaction_unittest.cc',
       'quic/chromium/quic_stream_factory_test.cc',
       'quic/chromium/quic_utils_chromium_test.cc',
-      'quic/chromium/quic_chromium_client_session_peer.cc',
-      'quic/chromium/quic_chromium_client_session_peer.h',
       'quic/core/congestion_control/bandwidth_sampler_test.cc',
       'quic/core/congestion_control/bbr_sender_test.cc',
       'quic/core/congestion_control/cubic_bytes_test.cc',
@@ -1746,15 +1746,15 @@
       'quic/core/quic_simple_buffer_allocator_test.cc',
       'quic/core/quic_socket_address_coder_test.cc',
       'quic/core/quic_spdy_stream_test.cc',
+      'quic/core/quic_stream_sequencer_buffer_test.cc',
       'quic/core/quic_stream_sequencer_test.cc',
+      'quic/core/quic_stream_test.cc',
       'quic/core/quic_sustained_bandwidth_recorder_test.cc',
       'quic/core/quic_time_test.cc',
       'quic/core/quic_unacked_packet_map_test.cc',
       'quic/core/quic_utils_test.cc',
       'quic/core/quic_write_blocked_list_test.cc',
-      'quic/core/quic_stream_test.cc',
       'quic/core/spdy_utils_test.cc',
-      'quic/core/quic_stream_sequencer_buffer_test.cc',
       'quic/quartc/quartc_alarm_factory_test.cc',
       'quic/quartc/quartc_session_test.cc',
       'quic/quartc/quartc_stream_test.cc',
@@ -1795,8 +1795,8 @@
       'quic/test_tools/quic_framer_peer.h',
       'quic/test_tools/quic_headers_stream_peer.cc',
       'quic/test_tools/quic_headers_stream_peer.h',
-      'quic/test_tools/quic_multipath_sent_packet_manager_peer.h',
       'quic/test_tools/quic_multipath_sent_packet_manager_peer.cc',
+      'quic/test_tools/quic_multipath_sent_packet_manager_peer.h',
       'quic/test_tools/quic_packet_creator_peer.cc',
       'quic/test_tools/quic_packet_creator_peer.h',
       'quic/test_tools/quic_packet_generator_peer.cc',
@@ -1813,6 +1813,8 @@
       'quic/test_tools/quic_spdy_stream_peer.h',
       'quic/test_tools/quic_stream_factory_peer.cc',
       'quic/test_tools/quic_stream_factory_peer.h',
+      'quic/test_tools/quic_stream_peer.cc',
+      'quic/test_tools/quic_stream_peer.h',
       'quic/test_tools/quic_stream_sequencer_buffer_peer.cc',
       'quic/test_tools/quic_stream_sequencer_buffer_peer.h',
       'quic/test_tools/quic_stream_sequencer_peer.cc',
@@ -1826,8 +1828,6 @@
       'quic/test_tools/quic_test_utils_test.cc',
       'quic/test_tools/quic_time_wait_list_manager_peer.cc',
       'quic/test_tools/quic_time_wait_list_manager_peer.h',
-      'quic/test_tools/quic_stream_peer.cc',
-      'quic/test_tools/quic_stream_peer.h',
       'quic/test_tools/rtt_stats_peer.cc',
       'quic/test_tools/rtt_stats_peer.h',
       'quic/test_tools/simple_quic_framer.cc',
@@ -1873,6 +1873,7 @@
       'socket/transport_client_socket_pool_test_util.h',
       'socket/transport_client_socket_pool_unittest.cc',
       'socket/transport_client_socket_unittest.cc',
+      'socket/udp_socket_unittest.cc',
       'socket/unix_domain_client_socket_posix_unittest.cc',
       'socket/unix_domain_server_socket_posix_unittest.cc',
       'socket/websocket_endpoint_lock_manager_unittest.cc',
@@ -1891,8 +1892,8 @@
       'spdy/hpack/hpack_output_stream_test.cc',
       'spdy/hpack/hpack_round_trip_test.cc',
       'spdy/hpack/hpack_static_table_test.cc',
-      'spdy/http2_write_scheduler_test.cc',
       'spdy/http2_priority_dependencies_unittest.cc',
+      'spdy/http2_write_scheduler_test.cc',
       'spdy/mock_spdy_framer_visitor.cc',
       'spdy/mock_spdy_framer_visitor.h',
       'spdy/priority_write_scheduler_test.cc',
@@ -1910,8 +1911,8 @@
       'spdy/spdy_http_stream_unittest.cc',
       'spdy/spdy_http_utils_unittest.cc',
       'spdy/spdy_network_transaction_unittest.cc',
-      'spdy/spdy_no_op_visitor.h',
       'spdy/spdy_no_op_visitor.cc',
+      'spdy/spdy_no_op_visitor.h',
       'spdy/spdy_pinnable_buffer_piece_test.cc',
       'spdy/spdy_prefixed_buffer_reader_test.cc',
       'spdy/spdy_protocol_test.cc',
@@ -1962,7 +1963,6 @@
       'tools/quic/test_tools/quic_in_memory_cache_peer.cc',
       'tools/quic/test_tools/quic_in_memory_cache_peer.h',
       'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
-      'udp/udp_socket_unittest.cc',
       'url_request/report_sender_unittest.cc',
       'url_request/sdch_dictionary_fetcher_unittest.cc',
       'url_request/url_fetcher_impl_unittest.cc',