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

url/url.gyp

Index: url/url.gyp
diff --git a/url/url.gyp b/url/url.gyp
index 9ab87e1a5782420249e085d0bd6fea5001555276..efed6c8c3f4b093dd11c8188a30b283e3d153152 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -19,8 +19,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
+        ':url_features',
       ],
       'sources': [
         '<@(gurl_sources)',
@@ -35,6 +34,40 @@
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
+
+      # ICU Alternatives for Android & iOS
+      'conditions': [
+        ['use_platform_icu_alternatives == 1', {
+          'sources!': [
+            'url_canon_icu.cc',
+            'url_canon_icu.h',
+          ],
+          'conditions': [
+            ['OS == "android"', {
+              'dependencies': [
+                'url_java',
+                'url_jni_headers',
+              ],
+              'sources': [
+                'url_canon_icu_alternatives_android.cc',
+                'url_canon_icu_alternatives_android.h',
+              ],
+            }],
+            ['OS == "ios"', {
+              'sources': [
+                'url_canon_icu_alternatives_ios.mm',
+              ],
+            }],
+          ],
+        },
+        # 'use_platform_icu_alternatives != 1'
+        {
+          'dependencies': [
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'url_unittests',
@@ -64,6 +97,21 @@
             'mojo/url_gurl_struct_traits_unittest.cc',
           ],
         }],
+        # Unit tests that are not supported by the current ICU alternatives on Android.
+        ['OS == "android" and use_platform_icu_alternatives == 1', {
+          'sources!': [
+            'url_canon_icu_unittest.cc',
+          ],
+        }],
+        # Unit tests that are not supported by the current ICU alternatives on iOS.
+        ['OS == "ios" and use_platform_icu_alternatives == 1', {
+          'sources!': [
+            'origin_unittest.cc',
+            'scheme_host_port_unittest.cc',
+            'url_canon_icu_unittest.cc',
+            'url_canon_unittest.cc',
+          ],
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
@@ -124,6 +172,17 @@
         'url_test_interfaces_mojom',
       ],
     },
+    {
+      # GN version: //url:features
+      'target_name': 'url_features',

[brettw, 2016/04/08 21:40:06]

Do we really need two of these? It makes sense to me that net depends on a
url_features target. Then we can delete the net_features one.

[kapishnikov, 2016/04/11 19:58:48]

Done. Got rid of |net_features| and |components_cronet_android_features|. In
both places, url_features are referenced instead. Same done for for GN.

+      'includes': [ '../build/buildflag_header.gypi' ],
+      'variables': {
+        'buildflag_header_path': 'url/features.h',
+        'buildflag_flags': [
+          'USE_PLATFORM_ICU_ALTERNATIVES=<(use_platform_icu_alternatives)',
+        ],
+      },
+    }
   ],
   'conditions': [
     ['OS=="android"', {
@@ -150,35 +209,6 @@
           ],
           'includes': [ '../build/java.gypi' ],
         },
-        {
-          # Same as url_lib but using ICU alternatives on Android.
-          'target_name': 'url_lib_use_icu_alternatives_on_android',
-          'type': '<(component)',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            'url_java',
-            'url_jni_headers',
-          ],
-          'sources': [
-            '<@(gurl_sources)',
-            'url_canon_icu_alternatives_android.cc',
-            'url_canon_icu_alternatives_android.h',
-          ],
-          'sources!': [
-            'url_canon_icu.cc',
-            'url_canon_icu.h',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '..',
-            ],
-          },
-          'defines': [
-            'URL_IMPLEMENTATION',
-            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
-          ],
-        },
       ],
     }],
     ['test_isolation_mode != "noop"', {