[Android] Add a Java version of net::test_server::EmbeddedTestServer.

net/test/android/net_test_jni_onload.cc

Index: net/test/android/net_test_jni_onload.cc
diff --git a/testing/android/native_test/native_test_jni_onload.cc b/net/test/android/net_test_jni_onload.cc
similarity index 51%
copy from testing/android/native_test/native_test_jni_onload.cc
copy to net/test/android/net_test_jni_onload.cc
index 8fecc444c0ecd306abadfbc323ba02c80aea3269..ac54b1fb1c1b6dbbea6a603f020a3b5e8945e422 100644
--- a/testing/android/native_test/native_test_jni_onload.cc
+++ b/net/test/android/net_test_jni_onload.cc
@@ -2,37 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "net/test/android/net_test_jni_onload.h"
+
 #include "base/android/base_jni_onload.h"
-#include "base/android/jni_android.h"
 #include "base/bind.h"
-#include "testing/android/native_test/native_test_launcher.h"
+#include "net/test/embedded_test_server/android/embedded_test_server_android.h"
+
+namespace net {
+namespace test {
 
 namespace {
 
 bool RegisterJNI(JNIEnv* env) {
-  return testing::android::RegisterNativeTestJNI(env);
+  return net::test_server::EmbeddedTestServerAndroid::
+      RegisterEmbeddedTestServerAndroid(env);
 }
 
 bool Init() {
-  testing::android::InstallHandlers();
   return true;
 }
 
-}  // namespace
+}  // namesapce
 
-
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
   std::vector<base::android::RegisterCallback> register_callbacks;
   register_callbacks.push_back(base::Bind(&RegisterJNI));
+  return base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);
+}
 
-  if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks))
-    return -1;
-
+bool OnJNIOnLoadInit() {
   std::vector<base::android::InitCallback> init_callbacks;
   init_callbacks.push_back(base::Bind(&Init));
-  if (!base::android::OnJNIOnLoadInit(init_callbacks))
-    return -1;
-
-  return JNI_VERSION_1_4;
+  return base::android::OnJNIOnLoadInit(init_callbacks);
 }
+
+}  // namespace test
+}  // namespace net