Revert of Make separate net and url GN targets with and without ICU

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 409 matching lines @@
       'base/backoff_entry_serializer.cc',
       'base/backoff_entry_serializer.h',
       'base/cache_type.h',
       'base/chunked_upload_data_stream.cc',
       'base/chunked_upload_data_stream.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/elements_upload_data_stream.cc',
       'base/elements_upload_data_stream.h',
       'base/expiring_cache.h',
       'base/external_estimate_provider.h',
       'base/file_stream.cc',
       'base/file_stream.h',
       'base/file_stream_context.cc',
       'base/file_stream_context.h',
@@ skipping 358 matching lines @@
       'dns/single_request_host_resolver.cc',
       'dns/single_request_host_resolver.h',
       'filter/filter.cc',
       'filter/filter.h',
       'filter/gzip_filter.cc',
       'filter/gzip_filter.h',
       'filter/gzip_header.cc',
       'filter/gzip_header.h',
       'filter/sdch_filter.cc',
       'filter/sdch_filter.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/disk_based_cert_cache.cc',
       'http/disk_based_cert_cache.h',
       'http/disk_cache_based_quic_server_info.cc',
       'http/disk_cache_based_quic_server_info.h',
       'http/failing_http_transaction_factory.cc',
       'http/failing_http_transaction_factory.h',
       'http/http_auth.cc',
       'http/http_auth.h',
@@ skipping 329 matching lines @@
       '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/certificate_report_sender.cc',
       'url_request/certificate_report_sender.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/ftp_protocol_handler.cc',
+      'url_request/ftp_protocol_handler.h',
       'url_request/http_user_agent_settings.h',
       'url_request/redirect_info.cc',
       'url_request/redirect_info.h',
       'url_request/sdch_dictionary_fetcher.cc',
       'url_request/sdch_dictionary_fetcher.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',
@@ skipping 15 matching lines @@
       '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_getter_observer.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_intercepting_job_factory.cc',
       'url_request/url_request_intercepting_job_factory.h',
       'url_request/url_request_interceptor.cc',
       'url_request/url_request_interceptor.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',
@@ skipping 15 matching lines @@
       'url_request/url_request_throttler_entry.h',
       'url_request/url_request_throttler_entry_interface.h',
       'url_request/url_request_throttler_manager.cc',
       'url_request/url_request_throttler_manager.h',
       'url_request/url_request_backoff_manager.cc',
       'url_request/url_request_backoff_manager.h',
       'url_request/view_cache_helper.cc',
       'url_request/view_cache_helper.h',
       'url_request/websocket_handshake_userdata_key.cc',
       'url_request/websocket_handshake_userdata_key.h',
+      'websockets/websocket_basic_handshake_stream.cc',
+      'websockets/websocket_basic_handshake_stream.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_challenge.cc',
+      'websockets/websocket_handshake_challenge.h',
+      'websockets/websocket_handshake_constants.cc',
+      'websockets/websocket_handshake_constants.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',
+      'websockets/websocket_stream.cc',
+      'websockets/websocket_stream.h',
     ],
     'net_extras_sources': [
       'extras/sqlite/cookie_crypto_delegate.h',
       'extras/sqlite/sqlite_channel_id_store.cc',
       'extras/sqlite/sqlite_channel_id_store.h',
       'extras/sqlite/sqlite_persistent_cookie_store.cc',
       'extras/sqlite/sqlite_persistent_cookie_store.h',
     ],
     'net_test_sources': [
       'android/dummy_spnego_authenticator.cc',
@@ skipping 544 matching lines @@
       'tools/quic/test_tools/simple_client.cc',
       'tools/quic/test_tools/simple_client.h',
     ],
     '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',
     ],
-    'net_file_support_sources': [
-      "base/directory_lister.cc",
-      "base/directory_lister.h",
-      "url_request/file_protocol_handler.cc",
-      "url_request/file_protocol_handler.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",
-    ],
-    'net_ftp_support_sources': [
-      "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",
-      "url_request/ftp_protocol_handler.cc",
-      "url_request/ftp_protocol_handler.h",
-      "url_request/url_request_ftp_job.cc",
-      "url_request/url_request_ftp_job.h",
-    ],
-    'net_websockets_sources': [
-      "websockets/websocket_basic_handshake_stream.cc",
-      "websockets/websocket_basic_handshake_stream.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_challenge.cc",
-      "websockets/websocket_handshake_challenge.h",
-      "websockets/websocket_handshake_constants.cc",
-      "websockets/websocket_handshake_constants.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",
-      "websockets/websocket_stream.cc",
-      "websockets/websocket_stream.h",
-    ],
     'net_docs_script': 'tools/net_docs/net_docs.py',
     'net_docs_sources': [
       'README.md',
       'docs/bug-triage.md',
       'docs/bug-triage-labels.md',
       'docs/bug-triage-suggested-workflow.md',
       'docs/life-of-a-url-request.md',
       'sdch/README.md',
     ],
     'net_docs_output_dir': '<(PRODUCT_DIR)/net/docs',
   }
 }