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

components/cronet/android/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 171 matching lines @@
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 }
 
 # 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",
+    "//net:net",

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

Just "//net" and "//url" here.

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

Done.

+    "//url:url",
   ]
 
   if (cronet_enable_data_reduction_proxy_support) {
     deps += [
       "//components/data_reduction_proxy/core/browser:browser_small",
       "//components/data_reduction_proxy/core/common:common_small",

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

it seems that common_small target is no longer defined.

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

Done.

     ]
   }
 }
 
 # cronet_static target depends on ICU and includes file and ftp support.
 cronet_static_tmpl("cronet_static") {
   deps = [
     "//base:i18n",
     "//net",
     "//url",
   ]
 
   if (cronet_enable_data_reduction_proxy_support) {
     deps += [
       "//components/data_reduction_proxy/core/browser",
       "//components/data_reduction_proxy/core/common",
     ]
   }
 }
 
 shared_library("cronet") {
   sources = [
     "cronet_jni.cc",
   ]
   deps = [
     ":cronet_static_small",
     "//base",
-    "//net:net_small",
+    "//net:net",
   ]
   ldflags = [ "-Wl,--version-script=" +
               rebase_path("//components/cronet/android/only_jni_exports.lst") ]
 
   # Avoid hide_native_jni_exports as it adds another version script, and the
   # ARM64 linker throws an error for multiple version scripts with anonymous
   # version tags.
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
@@ skipping 636 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }