Check library version and handle library load errors

chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
index e7fa043a1033d7656d9a144bf169ec7305253164..4ab2b6f8536ff3756edfbde756ced2579934b6b5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
@@ -19,6 +19,7 @@ import com.google.protos.ipc.invalidation.Types;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.BrowserStartupController;
+import org.chromium.content.common.ProcessInitException;
 
 import java.util.concurrent.Semaphore;
 
@@ -86,8 +87,14 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
                 public void run() {
                     initCommandLine();
                     if (mAsyncStartup) {
-                        BrowserStartupController.get(mApplication)
-                                .startBrowserProcessesAsync(callback);
+                        try {
+                            BrowserStartupController.get(mApplication)
+                                    .startBrowserProcessesAsync(callback);
+                        }
+                        catch (ProcessInitException e) {
+                            Log.e(TAG, "Unable to load native library.", e);
+                            System.exit(-1);
+                        }
                     } else {
                         startBrowserProcessesSync(callback);
                     }
@@ -104,22 +111,27 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
 
     private void startBrowserProcessesSync(
             final BrowserStartupController.StartupCallback callback) {
-        if (BrowserStartupController.get(mApplication).startBrowserProcessesSync(
-                BrowserStartupController.MAX_RENDERERS_LIMIT)) {
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onSuccess(false);
-                }
-            });
-        } else {
-            Log.e(TAG, "Unable to start browser process.");
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onFailure();
-                }
-            });
+        try {
+            if (BrowserStartupController.get(mApplication).startBrowserProcessesSync(
+                    BrowserStartupController.MAX_RENDERERS_LIMIT)) {
+                new Handler().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        callback.onSuccess(false);
+                    }
+                });
+            } else {
+                Log.e(TAG, "Unable to start browser process.");
+                new Handler().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        callback.onFailure();
+                    }
+                });
+            }
+        } catch (ProcessInitException e) {
+            Log.e(TAG, "Unable to load native library.", e);
+            System.exit(-1);
         }
     }