Index: chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java |
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java |
index 4ad0645137c409b0545f166545cc93b06ea464d4..0ad970b4307ecc491015b5ee4c0cc551e0c540ef 100644 |
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java |
+++ b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java |
@@ -10,6 +10,7 @@ import android.content.Intent; |
import android.net.Uri; |
import android.test.ActivityInstrumentationTestCase2; |
import android.text.TextUtils; |
+import android.util.Log; |
import org.chromium.base.ThreadUtils; |
import org.chromium.chrome.test.util.ApplicationData; |
@@ -17,6 +18,7 @@ import org.chromium.content.browser.BrowserStartupController; |
import org.chromium.content.browser.test.util.Criteria; |
import org.chromium.content.browser.test.util.CriteriaHelper; |
import org.chromium.content.common.CommandLine; |
+import org.chromium.content.common.ProcessInitException; |
import java.util.concurrent.atomic.AtomicBoolean; |
@@ -37,8 +39,13 @@ public class ChromiumTestShellTestBase extends |
@Override |
public void run() { |
CommandLine.initFromFile("/data/local/tmp/chromium-testshell-command-line"); |
- BrowserStartupController.get(targetContext).startBrowserProcessesSync( |
- BrowserStartupController.MAX_RENDERERS_LIMIT); |
+ try { |
+ BrowserStartupController.get(targetContext).startBrowserProcessesSync( |
+ BrowserStartupController.MAX_RENDERERS_LIMIT); |
+ } catch (ProcessInitException e) { |
+ Log.e(TAG, "Unable to load native library.", e); |
+ fail("Unable to load native library"); |
+ } |
} |
}); |
} |