Throw exception when initialization failed.

content/app/android/library_loader_hooks.cc

Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index a60155ff67bc92a79b260101ac6835ab5bbf8a1f..5919c9af9982224637797991ac7d70a8e8a710bb 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -22,6 +22,7 @@
 #include "content/common/android/common_jni_registrar.h"
 #include "content/common/android/command_line.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/result_codes.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
@@ -34,7 +35,7 @@ base::AtExitManager* g_at_exit_manager = NULL;
 
 namespace content {
 
-static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
+static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
                                           jobjectArray init_command_line) {

[joth, 2013/01/08 21:20:45]

indent wrong.

   InitNativeCommandLineFromJavaArray(env, init_command_line);
 
@@ -62,30 +63,30 @@ static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   if (!base::android::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!net::android::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!ui::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterCommonJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterBrowserJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterAppJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!media::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!gfx::RegisterJni(env))
-    return JNI_FALSE;
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;

[joth, 2013/01/08 21:20:45]

I don't think it's adding much to reuse result_codes.h for these. It seems the
other result codes would be impossible to return here, and conversely the
FAILED_TO_REGSITER_JNI is android only cannot happen subsequent to this point.

just returning a boolean and then on the java side include a message in the
exception (need a new c'tor overload) "JNI registration error" seems as good. we
can define exception.getErrorCode() == -1 to mean other or some such thing

[michaelbai, 2013/01/09 00:14:00]

I think it is better for user to find the error in one place. If we are
concerned about the change here, I can revert this file and add a native method
like
 int nativeGetFailedToRegisterJNIResultCode(). 
and add it in Java side. Sounds better?


On 2013/01/08 21:20:45, joth wrote:

 
-  return JNI_TRUE;
+  return 0;
 }
 
 void LibraryLoaderExitHook() {