Prep for passing fallback descriptor between browser and child processes.

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

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index d25ac652e7ba8474a3b459aae660b431935d3dd5..cf3d5c5b7524c75c9dbc86179628b6a3f24cc72b 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -102,11 +102,11 @@ public class ChildProcessService extends Service {
                             + ChildProcessConnection.EXTRA_FILES_ID_SUFFIX;
                     mFileIds.add(args.getInt(idName));
                 }
-                Bundle sharedRelros = args.getBundle(Linker.EXTRA_LINKER_SHARED_RELROS);
-                if (sharedRelros != null) {
-                    Linker.useSharedRelros(sharedRelros);
-                    sharedRelros = null;
-                }
+
+                Linker.initServiceProcess();
+                Bundle linkerBundle = args.getBundle(Linker.EXTRA_LINKER_SHARED_STATE);
+                Linker.consumeSharedStateBundle(linkerBundle);
+
                 mMainThread.notifyAll();
             }
             return Process.myPid();
@@ -153,12 +153,10 @@ public class ChildProcessService extends Service {
                             }
                         }
                         assert mLinkerParams != null;
-                        if (mLinkerParams.mWaitForSharedRelro) {
-                            requestedSharedRelro = true;
-                            Linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
-                        } else {
-                            Linker.disableSharedRelros();
-                        }
+                        Linker.initServiceProcess();
+                        Linker.enableSharedRelros(mLinkerParams.mBaseLoadAddress);
+                        requestedSharedRelro = true;
+
                         Linker.setTestRunnerClassName(mLinkerParams.mTestRunnerClassName);
                     }
                     boolean isLoaded = false;