Prep for passing fallback descriptor between browser and child processes.

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
index 2f783f27f0f90c9cadbaa35963ee752df9ac81cf..495ed5cf5667740f0951a5ae054fe4a52be7233a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
@@ -76,14 +76,14 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
         final String[] mCommandLine;
         final FileDescriptorInfo[] mFilesToBeMapped;
         final IChildProcessCallback mCallback;
-        final Bundle mSharedRelros;
+        final Bundle mLinkerSharedState;
 
         ConnectionParams(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
-                IChildProcessCallback callback, Bundle sharedRelros) {
+                IChildProcessCallback callback, Bundle linkerSharedState) {
             mCommandLine = commandLine;
             mFilesToBeMapped = filesToBeMapped;
             mCallback = callback;
-            mSharedRelros = sharedRelros;
+            mLinkerSharedState = linkerSharedState;
         }
     }
 
@@ -268,7 +268,7 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
             FileDescriptorInfo[] filesToBeMapped,
             IChildProcessCallback processCallback,
             ConnectionCallback connectionCallback,
-            Bundle sharedRelros) {
+            Bundle linkerSharedState) {
         synchronized (mLock) {
             assert mConnectionParams == null;
             if (mServiceDisconnected) {
@@ -280,7 +280,7 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
                 TraceEvent.begin("ChildProcessConnectionImpl.setupConnection");
                 mConnectionCallback = connectionCallback;
                 mConnectionParams = new ConnectionParams(
-                        commandLine, filesToBeMapped, processCallback, sharedRelros);
+                        commandLine, filesToBeMapped, processCallback, linkerSharedState);
                 // Run the setup if the service is already connected. If not,
                 // doConnectionSetupLocked() will be called from onServiceConnected().
                 if (mServiceConnectComplete) {
@@ -352,8 +352,8 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
             bundle.putInt(EXTRA_CPU_COUNT, CpuFeatures.getCount());
             bundle.putLong(EXTRA_CPU_FEATURES, CpuFeatures.getMask());
 
-            bundle.putBundle(Linker.EXTRA_LINKER_SHARED_RELROS,
-                             mConnectionParams.mSharedRelros);
+            bundle.putBundle(
+                    Linker.EXTRA_LINKER_SHARED_STATE, mConnectionParams.mLinkerSharedState);
 
             try {
                 mPid = mService.setupConnection(bundle, mConnectionParams.mCallback);