Remove the linker parameter from ChildProcessConnection.

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ skipping 747 matching lines @@
         }
     }
 
     /**
      * Create the common bundle to be passed to child processes.
      * @param context Application context.
      * @param commandLine Command line params to be passed to the service.
      * @param linkerParams Linker params to start the service.
      */
     protected static Bundle createsServiceBundle(
-            String[] commandLine, FileDescriptorInfo[] filesToBeMapped, Bundle sharedRelros) {
+            String[] commandLine, FileDescriptorInfo[] filesToBeMapped) {
         Bundle bundle = new Bundle();
         bundle.putStringArray(ChildProcessConstants.EXTRA_COMMAND_LINE, commandLine);
         bundle.putParcelableArray(ChildProcessConstants.EXTRA_FILES, filesToBeMapped);
         bundle.putInt(ChildProcessConstants.EXTRA_CPU_COUNT, CpuFeatures.getCount());
         bundle.putLong(ChildProcessConstants.EXTRA_CPU_FEATURES, CpuFeatures.getMask());
-        bundle.putBundle(Linker.EXTRA_LINKER_SHARED_RELROS, sharedRelros);
+        bundle.putBundle(Linker.EXTRA_LINKER_SHARED_RELROS, Linker.getInstance().getSharedRelros());
         return bundle;
     }
 
     @VisibleForTesting
     static void triggerConnectionSetup(
             final ChildProcessConnection connection,
             String[] commandLine,
             int childProcessId,
             FileDescriptorInfo[] filesToBeMapped,
             final int callbackType,
@@ skipping 11 matching lines @@
                         // If the connection fails and pid == 0, the Java-side cleanup was already
                         // handled by DeathCallback. We still have to call back to native for
                         // cleanup there.
                         if (clientContext != 0) {  // Will be 0 in Java instrumentation tests.
                             nativeOnChildProcessStarted(clientContext, pid);
                         }
                     }
                 };
 
         assert callbackType != CALLBACK_FOR_UNKNOWN_PROCESS;
-        connection.setupConnection(commandLine,
-                                   filesToBeMapped,
-                                   createCallback(childProcessId, callbackType),
-                                   connectionCallback,
-                                   Linker.getInstance().getSharedRelros());
+        connection.setupConnection(commandLine, filesToBeMapped,
+                createCallback(childProcessId, callbackType), connectionCallback);
     }
 
     /**
      * Terminates a child process. This may be called from any thread.
      *
      * @param pid The pid (process handle) of the service connection obtained from {@link #start}.
      */
     @CalledByNative
     static void stop(int pid) {
         Log.d(TAG, "stopping child connection: pid=%d", pid);
@@ skipping 149 matching lines @@
 
         return true;
     }
 
     private static native void nativeOnChildProcessStarted(long clientContext, int pid);
     private static native void nativeCompleteScopedSurfaceRequest(
             UnguessableToken requestToken, Surface surface);
     private static native boolean nativeIsSingleProcess();
     private static native Surface nativeGetViewSurface(int surfaceId);
 }