Prep for passing fallback descriptor between browser and child processes.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index 2a4f234b26d707ffa25f6c80326c5eceaeac26ae..801b11b1060ce6b1aefa5197142151ae11bfa887 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -283,9 +283,7 @@ public class ChildProcessLauncher {
 
         // Always wait for the shared RELROs in service processes.
         final boolean waitForSharedRelros = true;
-        return new ChromiumLinkerParams(sLinkerLoadAddress,
-                                waitForSharedRelros,
-                                Linker.getTestRunnerClassName());
+        return new ChromiumLinkerParams(sLinkerLoadAddress, Linker.getTestRunnerClassName());
     }
 
     private static ChildProcessConnection allocateBoundConnection(Context context,
@@ -601,11 +599,9 @@ public class ChildProcessLauncher {
                 };
 
         assert callbackType != CALLBACK_FOR_UNKNOWN_PROCESS;
-        connection.setupConnection(commandLine,
-                                   filesToBeMapped,
-                                   createCallback(childProcessId, callbackType),
-                                   connectionCallback,
-                                   Linker.getSharedRelros());
+        connection.setupConnection(commandLine, filesToBeMapped,
+                createCallback(childProcessId, callbackType), connectionCallback,
+                Linker.produceSharedStateBundle());
     }
 
     /**