Add Cronet Test App that uses libcronet_tests.so with net test utilities.

components/cronet/android/cronet_jni.cc

Index: components/cronet/android/cronet_jni.cc
diff --git a/components/cronet/android/cronet_jni.cc b/components/cronet/android/cronet_jni.cc
index 7ebd14131469e7035f7f10c2e1426c3d13133063..573a2dfcffcf0a177f93c824b16219bf20e35104 100644
--- a/components/cronet/android/cronet_jni.cc
+++ b/components/cronet/android/cronet_jni.cc
@@ -2,63 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/android/base_jni_registrar.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/at_exit.h"
-#include "components/cronet/android/chromium_url_request.h"
-#include "components/cronet/android/chromium_url_request_context.h"
-#include "net/android/net_jni_registrar.h"
-#include "url/android/url_jni_registrar.h"
-#include "url/url_util.h"
-
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
-#include "base/i18n/icu_util.h"
-#endif
-
-namespace {
-
-const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
-    {"BaseAndroid", base::android::RegisterJni},
-    {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
-    {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
-    {"NetAndroid", net::android::RegisterJni},
-    {"UrlAndroid", url::android::RegisterJni},
-};
-
-base::AtExitManager* g_at_exit_manager = NULL;
-
-}  // namespace
+#include "components/cronet/android/cronet_loader.h"
 
+// This is called by the VM when the shared library is first loaded.
 // Checks the available version of JNI. Also, caches Java reflection artifacts.

[mmenke, 2014/09/11 18:05:24]

This should probably go in the body of the new CronetOnLoad function.

[mef, 2014/09/11 18:37:54]

Done.

 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
-    return -1;
-  }
-
-  base::android::InitVM(vm);
-
-  if (!base::android::RegisterNativeMethods(
-          env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) {
-    return -1;
-  }
-
-  g_at_exit_manager = new base::AtExitManager();
-
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
-  base::i18n::InitializeICU();
-#endif
-
-  url::Initialize();
-
-  return JNI_VERSION_1_6;
+  return cronet::CronetOnLoad(vm, reserved);
 }
 
-extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
-  if (g_at_exit_manager) {
-    delete g_at_exit_manager;
-    g_at_exit_manager = NULL;
-  }
+extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* vm, void* reserved) {
+  cronet::CronetOnUnLoad(vm, reserved);
 }