Remove the linker parameter from ChildProcessConnection.

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

 // Copyright 2013 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.Intent;
 import android.content.ServiceConnection;
@@ skipping 73 matching lines @@
     // binding flag provided via ChildProcessCreationParams.
     // TODO(mnaganov): Get rid of it after the release of the next Android SDK.
     private static Boolean sNeedsExtrabindFlags[] = new Boolean[2];
 
     private static final String TAG = "ChildProcessConnect";
 
     private static class ConnectionParams {
         final String[] mCommandLine;
         final FileDescriptorInfo[] mFilesToBeMapped;
         final IChildProcessCallback mCallback;
-        final Bundle mSharedRelros;
 
         ConnectionParams(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
-                IChildProcessCallback callback, Bundle sharedRelros) {
+                IChildProcessCallback callback) {
             mCommandLine = commandLine;
             mFilesToBeMapped = filesToBeMapped;
             mCallback = callback;
-            mSharedRelros = sharedRelros;
         }
     }
 
     // This is set in start() and is used in onServiceConnected().
     private ChildProcessConnection.StartCallback mStartCallback;
 
     // This is set in setupConnection() and is later used in doConnectionSetupLocked(), after which
     // the variable is cleared. Therefore this is only valid while the connection is being set up.
     private ConnectionParams mConnectionParams;
 
@@ skipping 231 matching lines @@
                 } else {
                     mWaivedBinding.bind();
                 }
             }
         } finally {
             TraceEvent.end("ChildProcessConnectionImpl.start");
         }
     }
 
     @Override
-    public void setupConnection(
-            String[] commandLine,
-            FileDescriptorInfo[] filesToBeMapped,
-            IChildProcessCallback processCallback,
-            ConnectionCallback connectionCallback,
-            Bundle sharedRelros) {
+    public void setupConnection(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
+            IChildProcessCallback processCallback, ConnectionCallback connectionCallback) {
         synchronized (mLock) {
             assert mConnectionParams == null;
             if (mServiceDisconnected) {
                 Log.w(TAG, "Tried to setup a connection that already disconnected.");
                 connectionCallback.onConnected(0);
                 return;
             }
             try {
                 TraceEvent.begin("ChildProcessConnectionImpl.setupConnection");
                 mConnectionCallback = connectionCallback;
-                mConnectionParams = new ConnectionParams(
-                        commandLine, filesToBeMapped, processCallback, sharedRelros);
+                mConnectionParams =
+                        new ConnectionParams(commandLine, filesToBeMapped, processCallback);
                 // Run the setup if the service is already connected. If not,
                 // doConnectionSetupLocked() will be called from onServiceConnected().
                 if (mServiceConnectComplete) {
                     doConnectionSetupLocked();
                 }
             } finally {
                 TraceEvent.end("ChildProcessConnectionImpl.setupConnection");
             }
         }
     }
@@ skipping 17 matching lines @@
      * Called after the connection parameters have been set (in setupConnection()) *and* a
      * connection has been established (as signaled by onServiceConnected()). These two events can
      * happen in any order. Has to be called with mLock.
      */
     private void doConnectionSetupLocked() {
         try {
             TraceEvent.begin("ChildProcessConnectionImpl.doConnectionSetupLocked");
             assert mServiceConnectComplete && mService != null;
             assert mConnectionParams != null;
 
-            Bundle bundle =
-                    ChildProcessLauncher.createsServiceBundle(mConnectionParams.mCommandLine,
-                            mConnectionParams.mFilesToBeMapped, mConnectionParams.mSharedRelros);
+            Bundle bundle = ChildProcessLauncher.createsServiceBundle(
+                    mConnectionParams.mCommandLine, mConnectionParams.mFilesToBeMapped);
             try {
                 mPid = mService.setupConnection(bundle, mConnectionParams.mCallback);
                 assert mPid != 0 : "Child service claims to be run by a process of pid=0.";
             } catch (android.os.RemoteException re) {
                 Log.e(TAG, "Failed to setup connection.", re);
             }
             // We proactively close the FDs rather than wait for GC & finalizer.
             try {
                 for (FileDescriptorInfo fileInfo : mConnectionParams.mFilesToBeMapped) {
                     fileInfo.mFd.close();
@@ skipping 132 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }