Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1800)

Unified Diff: content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java

Issue 139743011: Change ContentLinker to share relro sections with browser process only on low-end devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gyp location Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/app/Linker.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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().
« no previous file with comments | « content/public/android/java/src/org/chromium/content/app/Linker.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698