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

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 89088101ee5592b1912fac50cd395cd0f6f3197d..40d63118c7f8b49c733397e91bd44252d49c6cfe 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -186,28 +186,6 @@ template("cronet_static_tmpl") {
   }
 }
 
-# cronet_static_small target has reduced binary size through using
-# ICU alternatives which requires file and ftp support be disabled.
-cronet_static_tmpl("cronet_static_small") {
-  defines = [
-    "USE_ICU_ALTERNATIVES_ON_ANDROID=1",
-    "DISABLE_FILE_SUPPORT=1",
-    "DISABLE_FTP_SUPPORT=1",
-  ]
-
-  deps = [
-    "//net:net_small",
-    "//url:url_lib_use_icu_alternatives_on_android",
-  ]
-
-  if (cronet_enable_data_reduction_proxy_support) {
-    deps += [
-      "//components/data_reduction_proxy/core/browser:browser_small",
-      "//components/data_reduction_proxy/core/common:common_small",
-    ]
-  }
-}
-
 # cronet_static target depends on ICU and includes file and ftp support.
 cronet_static_tmpl("cronet_static") {
   deps = [
@@ -229,9 +207,9 @@ shared_library("cronet") {
     "cronet_jni.cc",
   ]
   deps = [
-    ":cronet_static_small",
+    ":cronet_static",
     "//base",
-    "//net:net_small",
+    "//net:net",
   ]
   ldflags = [ "-Wl,--version-script=" +
               rebase_path("//components/cronet/android/only_jni_exports.lst") ]
@@ -517,6 +495,8 @@ android_assets("cronet_test_apk_assets") {
     "test/assets/test/content_length_mismatch.html.mock-http-headers",
     "test/assets/test/datareductionproxysuccess.txt",
     "test/assets/test/datareductionproxysuccess.txt.mock-http-headers",
+    "test/assets/test/gzipped.html",
+    "test/assets/test/gzipped.html.mock-http-headers",

[xunjieli, 2016/03/31 13:59:40]

Can we add the missing assets in a separate CL? 

[kapishnikov, 2016/03/31 16:25:52]

Done. https://codereview.chromium.org/1850443005/

     "test/assets/test/multiredirect.html",
     "test/assets/test/multiredirect.html.mock-http-headers",
     "test/assets/test/notfound.html",