| Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
|
| diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
|
| index b8cb09f94fdc7e697ffb6dfc833d72b3f7f5fdc8..4d9e6b727ba11640bda272156e18b40dcd41f037 100644
|
| --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
|
| +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
|
| @@ -18,6 +18,7 @@ import org.chromium.content.app.LibraryLoader;
|
| import org.chromium.content.browser.ContentView;
|
| import org.chromium.content.browser.DeviceUtils;
|
| import org.chromium.content.common.CommandLine;
|
| +import org.chromium.content.common.ProcessInitException;
|
| import org.chromium.ui.gfx.ActivityNativeWindow;
|
|
|
| /**
|
| @@ -40,9 +41,12 @@ public class ChromiumTestShellActivity extends ChromiumActivity {
|
| waitForDebuggerIfNeeded();
|
|
|
| DeviceUtils.addDeviceSpecificUserAgentSwitch(this);
|
| -
|
| - ContentView.initChromiumBrowserProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC);
|
| -
|
| + try {
|
| + ContentView.initChromiumBrowserProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC);
|
| + } catch (ProcessInitException e) {
|
| + Log.e(TAG, "Chromium browser process initialization failed", e);
|
| + finish();
|
| + }
|
| setContentView(R.layout.testshell_activity);
|
| mTabManager = (TabManager) findViewById(R.id.tab_manager);
|
| String startupUrl = getUrlFromIntent(getIntent());
|
|
|