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

components/cronet/android/cronet_library_loader.cc

Index: components/cronet/android/cronet_library_loader.cc
diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc
index e94c7754cf7c70d1afa0b80294d12c5ae8bf1752..16d1f052f6a936be9176ca687be987cd58cf54b3 100644
--- a/components/cronet/android/cronet_library_loader.cc
+++ b/components/cronet/android/cronet_library_loader.cc
@@ -5,6 +5,7 @@
 #include "components/cronet/android/cronet_library_loader.h"
 
 #include <jni.h>
+#include <vector>
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
@@ -29,7 +30,7 @@
 #include "net/base/network_change_notifier.h"
 #include "url/url_util.h"
 
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if defined(USE_PLATFORM_ICU_ALTERNATIVES)

[mef, 2016/04/01 20:42:49]

maybe we should enter a crbug to convert this into buildflag?

 #include "url/android/url_jni_registrar.h"  // nogncheck
 #else
 #include "base/i18n/icu_util.h"
@@ -50,7 +51,7 @@ const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
     {"CronetUrlRequestContextAdapter",
      CronetUrlRequestContextAdapterRegisterJni},
     {"NetAndroid", net::android::RegisterJni},
-#if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if defined(USE_PLATFORM_ICU_ALTERNATIVES)
     {"UrlAndroid", url::android::RegisterJni},
 #endif
 };
@@ -91,7 +92,7 @@ void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
 }
 
 void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
+#if !defined(USE_PLATFORM_ICU_ALTERNATIVES)
   base::i18n::InitializeICU();
 #endif