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..78c5a067491704dd3c950e8393d3314f84ee1912 100644
--- a/url/url.gyp
+++ b/url/url.gyp
@@ -19,8 +19,6 @@
       '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',
       ],
       'sources': [
         '<@(gurl_sources)',
@@ -35,6 +33,43 @@
       ],
       # 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',
+          ],
+          'defines': [
+            'USE_PLATFORM_ICU_ALTERNATIVES=1',
+          ],
+          '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 +99,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',

[mef, 2016/04/04 22:25:44]

Strange, that this list of disabled tests is different from url/BUILD.gn.
Also a bit strange that it fails, shouldn't it use java callbacks?

[kapishnikov, 2016/04/05 15:22:04]

See the previous comment regarding 'url_canon_icu_unittest.cc'.

I found the reason why the greater number of tests failed with GN. There was no
"deps += [ ":url_java" ]" in the 'url_unittests' target.

This fixed:
      "origin_unittest.cc",
      "scheme_host_port_unittest.cc",

Still two tests in 'url_canon_unittest.cc' are failing. E.g.:
C   14.472s Main  ../../url/url_canon_unittest.cc:594: Failure
C   14.472s Main  Value of: out_str
C   14.472s Main    Actual: "xn--rys3683h.cn"
C   14.472s Main  Expected: std::string(host_cases[i].expected)
C   14.472s Main  Which is: "%F0%AF%A1%A8%E5%A7%BB.cn"

I will investigate it further.

+          ],
+        }],
+        # 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, ],
@@ -150,35 +200,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"', {