Prep for passing fallback descriptor between browser and child processes.

content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java

Index: content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java
diff --git a/content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java b/content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java
index d31c79d1e3acef114f08b0216732715b8bc37313..c8fa0bee15cdf7deda72e09ba887785a7d1b7030 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChromiumLinkerParams.java
@@ -15,9 +15,6 @@ public class ChromiumLinkerParams {
     // Use this base address to load native shared libraries. If 0, ignore other members.
     public final long mBaseLoadAddress;
 
-    // If true, wait for a shared RELRO Bundle just after loading the libraries.
-    public final boolean mWaitForSharedRelro;
-
     // If not empty, name of Linker.TestRunner implementation that needs to be
     // registered in the service process.
     public final String mTestRunnerClassName;
@@ -25,17 +22,11 @@ public class ChromiumLinkerParams {
     private static final String EXTRA_LINKER_PARAMS_BASE_LOAD_ADDRESS =
             "org.chromium.content.common.linker_params.base_load_address";
 
-    private static final String EXTRA_LINKER_PARAMS_WAIT_FOR_SHARED_RELRO =
-            "org.chromium.content.common.linker_params.wait_for_shared_relro";
-
     private static final String EXTRA_LINKER_PARAMS_TEST_RUNNER_CLASS_NAME =
             "org.chromium.content.common.linker_params.test_runner_class_name";
 
-    public ChromiumLinkerParams(long baseLoadAddress,
-                        boolean waitForSharedRelro,
-                        String testRunnerClassName) {
+    public ChromiumLinkerParams(long baseLoadAddress, String testRunnerClassName) {
         mBaseLoadAddress = baseLoadAddress;
-        mWaitForSharedRelro = waitForSharedRelro;
         mTestRunnerClassName = testRunnerClassName;
     }
 
@@ -46,8 +37,6 @@ public class ChromiumLinkerParams {
      */
     public ChromiumLinkerParams(Intent intent) {
         mBaseLoadAddress = intent.getLongExtra(EXTRA_LINKER_PARAMS_BASE_LOAD_ADDRESS, 0);
-        mWaitForSharedRelro = intent.getBooleanExtra(
-                EXTRA_LINKER_PARAMS_WAIT_FOR_SHARED_RELRO, false);
         mTestRunnerClassName = intent.getStringExtra(
                 EXTRA_LINKER_PARAMS_TEST_RUNNER_CLASS_NAME);
     }
@@ -59,18 +48,14 @@ public class ChromiumLinkerParams {
      */
     public void addIntentExtras(Intent intent) {
         intent.putExtra(EXTRA_LINKER_PARAMS_BASE_LOAD_ADDRESS, mBaseLoadAddress);
-        intent.putExtra(EXTRA_LINKER_PARAMS_WAIT_FOR_SHARED_RELRO, mWaitForSharedRelro);
         intent.putExtra(EXTRA_LINKER_PARAMS_TEST_RUNNER_CLASS_NAME, mTestRunnerClassName);
     }
 
     // For debugging traces only.
     @Override
     public String toString() {
-        return String.format(
-                "LinkerParams(baseLoadAddress:0x%x, waitForSharedRelro:%s, "
-                        + "testRunnerClassName:%s",
+        return String.format("LinkerParams(baseLoadAddress:0x%x, testRunnerClassName:%s",
                 mBaseLoadAddress,
-                mWaitForSharedRelro ? "true" : "false",
                 mTestRunnerClassName);
     }
 }