Java API for mojo system.

mojo/android/javatests/init_library.cc

Index: mojo/android/javatests/init_library.cc
diff --git a/mojo/shell/android/library_loader.cc b/mojo/android/javatests/init_library.cc
similarity index 64%
copy from mojo/shell/android/library_loader.cc
copy to mojo/android/javatests/init_library.cc
index 37d6592521f4f037b546d25fdcf7bd2e262a10a5..7b4cbe351775c1782b31879b0ae5be684ede7a46 100644
--- a/mojo/shell/android/library_loader.cc
+++ b/mojo/android/javatests/init_library.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
@@ -6,16 +6,14 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
-#include "base/logging.h"
-#include "mojo/services/native_viewport/native_viewport_android.h"
-#include "mojo/shell/android/mojo_main.h"
-#include "net/android/net_jni_registrar.h"
+#include "mojo/android/javatests/core_test.h"
+#include "mojo/android/system/core_impl.h"
 
 namespace {
 
 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
-  { "MojoMain", mojo::RegisterMojoMain },
-  { "NativeViewportAndroid", mojo::services::NativeViewportAndroid::Register },
+  { "CoreImpl", mojo::android::RegisterCoreImpl },
+  { "CoreTest", mojo::android::RegisterCoreTest },
 };
 
 bool RegisterMojoJni(JNIEnv* env) {
@@ -25,7 +23,6 @@ bool RegisterMojoJni(JNIEnv* env) {
 
 }  // namespace
 
-// This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
@@ -36,9 +33,6 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   if (!base::android::RegisterJni(env))
     return -1;
 
-  if (!net::android::RegisterJni(env))
-    return -1;
-
   if (!RegisterMojoJni(env))
     return -1;