| Index: content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
|
| diff --git a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
|
| index 785ca193d96080b1595c50480ede74f0982b0be0..7a2a46e600dd12ee600b8c9d69f20ded021033de 100644
|
| --- a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
|
| +++ b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
|
| @@ -25,6 +25,9 @@ import org.chromium.content_shell.ShellManager;
|
| import org.chromium.ui.base.ActivityWindowAndroid;
|
| import org.chromium.ui.base.WindowAndroid;
|
|
|
| +/**
|
| + * Test activity used for verifying the different configuration options for the ContentLinker.
|
| + */
|
| public class ContentLinkerTestActivity extends Activity {
|
| public static final String COMMAND_LINE_FILE =
|
| "/data/local/tmp/content-linker-test-command-line";
|
| @@ -101,18 +104,23 @@ public class ContentLinkerTestActivity extends Activity {
|
|
|
| mShellManager.setStartupUrl("about:blank");
|
|
|
| - BrowserStartupController.get(this).startBrowserProcessesAsync(
|
| - new BrowserStartupController.StartupCallback() {
|
| - @Override
|
| - public void onSuccess(boolean alreadyStarted) {
|
| - finishInitialization(savedInstanceState);
|
| - }
|
| -
|
| - @Override
|
| - public void onFailure() {
|
| - initializationFailed();
|
| - }
|
| - });
|
| + try {
|
| + BrowserStartupController.get(this).startBrowserProcessesAsync(
|
| + new BrowserStartupController.StartupCallback() {
|
| + @Override
|
| + public void onSuccess(boolean alreadyStarted) {
|
| + finishInitialization(savedInstanceState);
|
| + }
|
| +
|
| + @Override
|
| + public void onFailure() {
|
| + initializationFailed();
|
| + }
|
| + });
|
| + } catch (ProcessInitException e) {
|
| + Log.e(TAG, "Unable to load native library.", e);
|
| + finish();
|
| + }
|
|
|
| // TODO(digit): Ensure that after the content view is initialized,
|
| // the program finishes().
|
|
|