[Merge m58] Abstracting parameters passed to child processes on Android.

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 68 matching lines @@
             for (int i = 0; i < numChildServices; i++) {
                 mFreeConnectionIndices.add(i);
             }
             mChildClassName = serviceClassName;
             mInSandbox = inSandbox;
         }
 
         // Allocate or enqueue. If there are no free slots, return null and enqueue the spawn data.
         public ChildProcessConnection allocate(SpawnData spawnData,
                 ChildProcessConnection.DeathCallback deathCallback,
-                ChromiumLinkerParams chromiumLinkerParams, boolean alwaysInForeground) {
+                Bundle childProcessCommonParameters, boolean alwaysInForeground) {
             assert spawnData.inSandbox() == mInSandbox;
             synchronized (mConnectionLock) {
                 if (mFreeConnectionIndices.isEmpty()) {
                     Log.d(TAG, "Ran out of services to allocate.");
                     if (!spawnData.forWarmUp()) {
                         mPendingSpawnQueue.add(spawnData);
                     }
                     return null;
                 }
                 int slot = mFreeConnectionIndices.remove(0);
                 assert mChildProcessConnections[slot] == null;
-                mChildProcessConnections[slot] = new ChildProcessConnectionImpl(spawnData.context(),
-                        slot, mInSandbox, deathCallback, mChildClassName, chromiumLinkerParams,
-                        alwaysInForeground, spawnData.getCreationParams());
+                mChildProcessConnections[slot] =
+                        new ChildProcessConnectionImpl(spawnData.context(), slot, mInSandbox,
+                                deathCallback, mChildClassName, childProcessCommonParameters,
+                                alwaysInForeground, spawnData.getCreationParams());
                 Log.d(TAG, "Allocator allocated a connection, sandbox: %b, slot: %d", mInSandbox,
                         slot);
                 return mChildProcessConnections[slot];
             }
         }
 
         // Also return the first SpawnData in the pending queue, if any.
         public SpawnData free(ChildProcessConnection connection) {
             synchronized (mConnectionLock) {
                 int slot = connection.getServiceNumber();
@@ skipping 230 matching lines @@
         }
         return sSandboxedChildConnectionAllocatorMap.get(packageName);
     }
 
     private static ChildConnectionAllocator getAllocatorForTesting(
             Context context, String packageName, boolean inSandbox) {
         initConnectionAllocatorsIfNecessary(context, inSandbox, packageName);
         return getConnectionAllocator(packageName, inSandbox);
     }
 
-    private static ChildProcessConnection allocateConnection(SpawnData spawnData,
-            ChromiumLinkerParams chromiumLinkerParams, boolean alwaysInForeground) {
+    private static ChildProcessConnection allocateConnection(
+            SpawnData spawnData, Bundle childProcessCommonParams, boolean alwaysInForeground) {
         ChildProcessConnection.DeathCallback deathCallback =
                 new ChildProcessConnection.DeathCallback() {
                     @Override
                     public void onChildProcessDied(ChildProcessConnection connection) {
                         if (connection.getPid() != 0) {
                             stop(connection.getPid());
                         } else {
                             freeConnection(connection);
                         }
                     }
                 };
         final ChildProcessCreationParams creationParams = spawnData.getCreationParams();
         final Context context = spawnData.context();
         final boolean inSandbox = spawnData.inSandbox();
         String packageName =
                 creationParams != null ? creationParams.getPackageName() : context.getPackageName();
         initConnectionAllocatorsIfNecessary(context, inSandbox, packageName);
         return getConnectionAllocator(packageName, inSandbox)
-                .allocate(spawnData, deathCallback, chromiumLinkerParams, alwaysInForeground);
+                .allocate(spawnData, deathCallback, childProcessCommonParams, alwaysInForeground);
     }
 
     private static boolean sLinkerInitialized;
     private static long sLinkerLoadAddress;
 
     private static ChromiumLinkerParams getLinkerParamsForNewConnection() {
         if (!sLinkerInitialized) {
             if (Linker.isUsed()) {
                 sLinkerLoadAddress = Linker.getInstance().getBaseLoadAddress();
                 if (sLinkerLoadAddress == 0) {
@@ skipping 17 matching lines @@
             return new ChromiumLinkerParams(sLinkerLoadAddress,
                                             waitForSharedRelros);
         }
     }
 
     private static ChildProcessConnection allocateBoundConnection(SpawnData spawnData,
             boolean alwaysInForeground, ChildProcessConnection.StartCallback startCallback) {
         final Context context = spawnData.context();
         final boolean inSandbox = spawnData.inSandbox();
         final ChildProcessCreationParams creationParams = spawnData.getCreationParams();
-        ChromiumLinkerParams chromiumLinkerParams = getLinkerParamsForNewConnection();
+        Bundle commonParams = new Bundle();
+        commonParams.putParcelable(
+                ChildProcessConstants.EXTRA_LINKER_PARAMS, getLinkerParamsForNewConnection());
         ChildProcessConnection connection =
-                allocateConnection(spawnData, chromiumLinkerParams, alwaysInForeground);
+                allocateConnection(spawnData, commonParams, alwaysInForeground);
         if (connection != null) {
             connection.start(startCallback);
 
             String packageName = creationParams != null ? creationParams.getPackageName()
                                                         : context.getPackageName();
             if (inSandbox
                     && !getConnectionAllocator(packageName, inSandbox)
                                 .isFreeConnectionAvailable()) {
                 // Proactively releases all the moderate bindings once all the sandboxed services
                 // are allocated, which will be very likely to have some of them killed by OOM
@@ skipping 456 matching lines @@
         return allocateBoundConnection(
                 new SpawnData(false /* forWarmUp */, context, null /* commandLine */,
                         0 /* childProcessId */, null /* filesToBeMapped */, 0 /* clientContext */,
                         CALLBACK_FOR_RENDERER_PROCESS, true /* inSandbox */, creationParams),
                 false /* alwaysInForeground */, null);
     }
 
     @VisibleForTesting
     static ChildProcessConnection allocateConnectionForTesting(Context context,
             ChildProcessCreationParams creationParams) {
+        Bundle commonParams = new Bundle();
+        commonParams.putParcelable(
+                ChildProcessConstants.EXTRA_LINKER_PARAMS, getLinkerParamsForNewConnection());
         return allocateConnection(
                 new SpawnData(false /* forWarmUp */, context, null /* commandLine */,
                         0 /* childProcessId */, null /* filesToBeMapped */, 0 /* clientContext */,
                         CALLBACK_FOR_RENDERER_PROCESS, true /* inSandbox */, creationParams),
-                getLinkerParamsForNewConnection(), false);
+                commonParams, false);
     }
 
     /**
      * Queue up a spawn requests for testing.
      */
     @VisibleForTesting
     static void enqueuePendingSpawnForTesting(Context context, String[] commandLine,
             ChildProcessCreationParams creationParams, boolean inSandbox) {
         String packageName = creationParams != null ? creationParams.getPackageName()
                 : context.getPackageName();
@@ skipping 59 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);
 }