Throw exception when initialization failed.

content/public/android/java/src/org/chromium/content/app/LibraryLoader.java

Index: content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
diff --git a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
index 75e40c00e70265e59c959771ceeff85df7d63a9e..366b7563c5a0f92456abd48454b4240bb0409b25 100644
--- a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
+++ b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
@@ -11,6 +11,7 @@ import android.util.Log;
 
 import org.chromium.base.JNINamespace;
 import org.chromium.content.common.CommandLine;
+import org.chromium.content.common.ProcessInitException;
 import org.chromium.content.common.TraceEvent;
 
 /**
@@ -57,7 +58,7 @@ public class LibraryLoader {
     }
 
     @Deprecated
-    public static void loadAndInitSync() {
+    public static void loadAndInitSync() throws ProcessInitException {

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

could you  just delete this method? it's finally not called anywhere any more

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

Done.

         // TODO(joth): remove in next patch.
         ensureInitialized();
     }
@@ -66,7 +67,7 @@ public class LibraryLoader {
      *  This method blocks until the library is fully loaded and initialized;
      *  must be called on the thread that the native will call its "main" thread.
      */
-    public static void ensureInitialized() {
+    public static void ensureInitialized() throws ProcessInitException {
         checkThreadUsage();
         if (sInitialized) {
             // Already initialized, nothing to do.
@@ -77,15 +78,6 @@ public class LibraryLoader {
     }
 
     /**
-     * @throws UnsatisfiedLinkError if the library is not yet initialized.
-     */
-    public static void checkIsReady() {
-        if (!sInitialized) {
-            throw new UnsatisfiedLinkError(sLibrary + " is not initialized");
-        }
-    }
-
-    /**
      * Loads the library and blocks until the load completes. The caller is responsible
      * for subsequently calling ensureInitialized().
      * May be called on any thread, but should only be called once. Note the thread
@@ -116,14 +108,15 @@ public class LibraryLoader {
      * @param initCommandLine The command line arguments that native command line will
      * be initialized with.
      */
-    static void initializeOnMainThread(String[] initCommandLine) {
+    static void initializeOnMainThread(String[] initCommandLine) throws ProcessInitException {
         checkThreadUsage();
         if (sInitialized) {
             return;
         }
-        if (!nativeLibraryLoadedOnMainThread(initCommandLine)) {
+        int resultCode = nativeLibraryLoadedOnMainThread(initCommandLine);
+        if (resultCode != 0) {
             Log.e(TAG, "error calling nativeLibraryLoadedOnMainThread");

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

may as well log the code here.

-            throw new UnsatisfiedLinkError();
+            throw new ProcessInitException(resultCode);
         }
         // From this point on, native code is ready to use and checkIsReady()
         // shouldn't complain from now on (and in fact, it's used by the
@@ -133,7 +126,7 @@ public class LibraryLoader {
         TraceEvent.setEnabledToMatchNative();
     }
 
-    static private void initializeOnMainThread() {
+    static private void initializeOnMainThread() throws ProcessInitException {
         checkThreadUsage();
         if (!sInitialized) {
             initializeOnMainThread(CommandLine.getJavaSwitchesOrNull());
@@ -166,5 +159,7 @@ public class LibraryLoader {
     // This is the only method that is registered during System.loadLibrary, as it
     // may happen on a different thread. We then call it on the main thread to register
     // everything else.
-    private static native boolean nativeLibraryLoadedOnMainThread(String[] initCommandLine);
+    // Return 0 on success, otherwise return the error code from
+    // content/public/common/result_codes.h.
+    private static native int nativeLibraryLoadedOnMainThread(String[] initCommandLine);
 }