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

net/net_common.gypi

 # Copyright 2015 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 target is included in both 'net' and 'net_small'.
   'type': '<(component)',
   'variables': { 'enable_wexit_time_destructors': 1, },
   'dependencies': [
     '../base/base.gyp:base',
@@ skipping 68 matching lines @@
         ],
       },
       'sources!': [
         'disk_cache/blockfile/mapped_file_posix.cc',
       ],
     }, { # else
       'sources!': [
         'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
       ],
     }],
-    ['disable_file_support!=1', {
+    ['disable_file_support==1', {
       # TODO(mmenke):  Should probably get rid of the dependency on
       # net_resources in this case (It's used in net_util, to format
       # directory listings.  Also used outside of net/).
-      'sources': ['<@(net_file_support_sources)']
+      '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',
+      ],
     }],
-    ['disable_ftp_support!=1', {
-      'sources': ['<@(net_ftp_support_sources)']
+    ['disable_ftp_support==1', {
+      'sources/': [
+        ['exclude', '^ftp/'],
+      ],
+      'sources!': [
+        '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',
+      ],
     }],
     ['enable_built_in_dns==1', {
       'defines': [
         'ENABLE_BUILT_IN_DNS',
       ]
     }, { # else
       'sources!': [
         'dns/address_sorter_posix.cc',
         'dns/address_sorter_posix.h',
         'dns/dns_client.cc',
@@ skipping 169 matching lines @@
       },
     ],
     # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's
     # libssl, but our bundled copy is not built in OpenSSL ports. Pull that
     # file in directly.
     [ 'use_nss_certs == 1 and use_openssl == 1', {
         'sources': [
           'third_party/nss/ssl/cmpcert.c',
         ],
     }],
-    [ 'enable_websockets == 1', {
-        'sources': ['<@(net_websockets_sources)']
+    [ 'enable_websockets != 1', {
+        'sources/': [
+          ['exclude', '^websockets/'],
+        ],
     }],
     [ 'enable_mdns != 1', {
         'sources!' : [
           'dns/mdns_cache.cc',
           'dns/mdns_cache.h',
           'dns/mdns_client.cc',
           'dns/mdns_client.h',
           'dns/mdns_client_impl.cc',
           'dns/mdns_client_impl.h',
           'dns/record_parsed.cc',
@@ skipping 113 matching lines @@
         ['include', '^cert/test_root_certs_nss\\.cc$'],
         ['include', '^cert/x509_util_nss_certs\\.cc$'],
         ['include', '^cert_net/nss_ocsp\\.cc$'],
         ['include', '^cert_net/nss_ocsp\\.h$'],
         ['include', '^proxy/proxy_resolver_mac\\.cc$'],
         ['include', '^proxy/proxy_server_mac\\.cc$'],
       ],
     }],
   ],
 }