Remove net & url small, iOS ICU alternatives, unit tests.

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index ce5a031a183e27f527d5cc88fe84da0d6d3f6939..754c9e8d3246dc27ef1b75c237998f6bde91e316 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -174,18 +174,11 @@
           ],
         },
         {
-          # cronet_static_small target has reduced binary size through using
-          # ICU alternatives which requires file and ftp support be disabled.
-          'target_name': 'cronet_static_small',
+          'target_name': 'cronet_static',
           'type': 'static_library',
-          'defines': [
-            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
-            'DISABLE_FILE_SUPPORT=1',
-            'DISABLE_FTP_SUPPORT=1',
-          ],
           'dependencies': [
-            '../net/net.gyp:net_small',
-            '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+            '../net/net.gyp:net',
+            '../url/url.gyp:url_lib',
           ],
           'conditions': [
             ['enable_data_reduction_proxy_support==1',
@@ -195,23 +188,10 @@
                 ],
               },
             ],
-          ],
-          'includes': [ 'cronet/cronet_static.gypi' ],
-        },
-        {
-          # cronet_static target depends on ICU and includes file and ftp support.
-          'target_name': 'cronet_static',
-          'type': 'static_library',
-          'dependencies': [
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            '../url/url.gyp:url_lib',
-          ],
-          'conditions': [
-            ['enable_data_reduction_proxy_support==1',
+            ['use_platform_icu_alternatives!=1',
               {
                 'dependencies': [
-                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                  '../base/base.gyp:base_i18n',
                 ],
               },
             ],
@@ -225,9 +205,9 @@
             'cronet/android/cronet_jni.cc',
           ],
           'dependencies': [
-            'cronet_static_small',
+            'cronet_static',
             '../base/base.gyp:base',
-            '../net/net.gyp:net_small',
+            '../net/net.gyp:net',
           ],
           'ldflags': [
             '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst',
@@ -431,7 +411,7 @@
             ['enable_data_reduction_proxy_support==1',
               {
                 'dependencies': [
-                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                  '../components/components.gyp:data_reduction_proxy_core_browser_small',
                 ],
               },
             ],
@@ -726,6 +706,17 @@
             },
           ],
         },
+        {
+          # GN version: //components/cronet/android:features
+          'target_name': 'components_cronet_android_features',
+          'includes': [ '../build/buildflag_header.gypi' ],
+          'variables': {
+            'buildflag_header_path': 'components/cronet/android/features.h',
+            'buildflag_flags': [
+              'USE_PLATFORM_ICU_ALTERNATIVES=<(use_platform_icu_alternatives)',
+            ],
+          },
+        }
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,