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

url/BUILD.gn

Index: url/BUILD.gn
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 361c516fd28584324eb085477122423c0db687df..cdb683a7a9394435193c662863c421035f66a8f3 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -3,72 +3,107 @@
 # found in the LICENSE file.
 
 import("//testing/test.gni")
+import("features.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-# Shared sources between url and url_lib_use_icu_alternatives_on_android.
-url_shared_sources = [
-  "gurl.cc",
-  "gurl.h",
-  "origin.cc",
-  "origin.h",
-  "scheme_host_port.cc",
-  "scheme_host_port.h",
-  "third_party/mozilla/url_parse.cc",
-  "third_party/mozilla/url_parse.h",
-  "url_canon.h",
-  "url_canon_etc.cc",
-  "url_canon_filesystemurl.cc",
-  "url_canon_fileurl.cc",
-  "url_canon_host.cc",
-  "url_canon_internal.cc",
-  "url_canon_internal.h",
-  "url_canon_internal_file.h",
-  "url_canon_ip.cc",
-  "url_canon_ip.h",
-  "url_canon_mailtourl.cc",
-  "url_canon_path.cc",
-  "url_canon_pathurl.cc",
-  "url_canon_query.cc",
-  "url_canon_relative.cc",
-  "url_canon_stdstring.cc",
-  "url_canon_stdstring.h",
-  "url_canon_stdurl.cc",
-  "url_constants.cc",
-  "url_constants.h",
-  "url_export.h",
-  "url_file.h",
-  "url_parse_file.cc",
-  "url_parse_internal.h",
-  "url_util.cc",
-  "url_util.h",
-]
+config("url_config") {
+  defines = []
+  if (use_platform_icu_alternatives) {
+    defines += [ "USE_PLATFORM_ICU_ALTERNATIVES=1" ]
+  }
+}
 
 component("url") {
-  sources = url_shared_sources + [
-              "url_canon_icu.cc",
-              "url_canon_icu.h",
-            ]
+  sources = [
+    "gurl.cc",
+    "gurl.h",
+    "origin.cc",
+    "origin.h",
+    "scheme_host_port.cc",
+    "scheme_host_port.h",
+    "third_party/mozilla/url_parse.cc",
+    "third_party/mozilla/url_parse.h",
+    "url_canon.h",
+    "url_canon_etc.cc",
+    "url_canon_filesystemurl.cc",
+    "url_canon_fileurl.cc",
+    "url_canon_host.cc",
+    "url_canon_internal.cc",
+    "url_canon_internal.h",
+    "url_canon_internal_file.h",
+    "url_canon_ip.cc",
+    "url_canon_ip.h",
+    "url_canon_mailtourl.cc",
+    "url_canon_path.cc",
+    "url_canon_pathurl.cc",
+    "url_canon_query.cc",
+    "url_canon_relative.cc",
+    "url_canon_stdstring.cc",
+    "url_canon_stdstring.h",
+    "url_canon_stdurl.cc",
+    "url_constants.cc",
+    "url_constants.h",
+    "url_export.h",
+    "url_file.h",
+    "url_parse_file.cc",
+    "url_parse_internal.h",
+    "url_util.cc",
+    "url_util.h",
+  ]
 
-  if (is_win) {
-    # Don't conflict with Windows' "url.dll".
-    output_name = "url_lib"
-  }
   defines = [ "URL_IMPLEMENTATION" ]
 
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
+    ":url_config",
   ]
 
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//third_party/icu",
-    "//third_party/icu:icudata",
   ]
+
+  if (is_win) {
+    # Don't conflict with Windows' "url.dll".
+    output_name = "url_lib"
+  }
+
+  # ICU support.
+  if (use_platform_icu_alternatives) {
+    if (is_android) {
+      sources += [
+        "android/url_jni_registrar.cc",
+        "android/url_jni_registrar.h",
+        "url_canon_icu_alternatives_android.cc",
+        "url_canon_icu_alternatives_android.h",
+      ]
+      deps += [
+        ":url_java",
+        ":url_jni_headers",
+        "//base",
+        "//base/third_party/dynamic_annotations",
+      ]
+    } else if (is_ios) {
+      sources += [ "url_canon_icu_alternatives_ios.mm" ]
+    } else {
+      assert(false,
+             "ICU alternative is not implemented for platform: " + target_os)
+    }
+  } else {
+    # use third-party ICU implementation.

[brettw, 2016/04/04 22:54:11]

This comment is confusing me since it might be saying "not ICU but another
implementation of ICU". I'd just say "Use ICU."

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

Done.

+    sources += [
+      "url_canon_icu.cc",
+      "url_canon_icu.h",
+    ]
+    deps += [
+      "//third_party/icu",
+      "//third_party/icu:icudata",
+    ]
+  }
 }
 
 if (is_android) {
@@ -85,32 +120,6 @@ if (is_android) {
     ]
     jni_package = "url"
   }
-
-  component("url_lib_use_icu_alternatives_on_android") {
-    sources = url_shared_sources + [
-                "android/url_jni_registrar.cc",
-                "android/url_jni_registrar.h",
-                "url_canon_icu_alternatives_android.cc",
-                "url_canon_icu_alternatives_android.h",
-              ]
-
-    defines = [
-      "URL_IMPLEMENTATION",
-      "USE_ICU_ALTERNATIVES_ON_ANDROID=1",
-    ]
-
-    configs += [
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
-
-    deps = [
-      ":url_java",
-      ":url_jni_headers",
-      "//base",
-      "//base/third_party/dynamic_annotations",
-    ]
-  }
 }
 
 test("url_unittests") {
@@ -130,6 +139,26 @@ test("url_unittests") {
     sources += [ "mojo/url_gurl_struct_traits_unittest.cc" ]
   }
 
+  # Unit tests that are not supported by the current ICU alternatives on Android.
+  if (is_android && use_platform_icu_alternatives) {
+    sources -= [
+      "origin_unittest.cc",
+      "scheme_host_port_unittest.cc",
+      "url_canon_icu_unittest.cc",

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

It's a bit strange that it fails on Android, shouldn't it work through platform
callbacks?

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

The test depends on ICUCharsetConverter
https://code.google.com/p/chromium/codesearch#chromium/src/url/url_canon_icu_...

I found only one implementation of it:
https://code.google.com/p/chromium/codesearch#chromium/src/url/url_canon_icu.cc
, which depends on third_party/icu.

+      "url_canon_unittest.cc",
+    ]
+  }
+
+  # Unit tests that are not supported by the current ICU alternatives on iOS.
+  if (is_ios && use_platform_icu_alternatives) {
+    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.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]