Moving some CPL logic to CPLH.

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildSpawnData.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildSpawnData.java b/content/public/android/java/src/org/chromium/content/browser/ChildSpawnData.java
index 282b8f072883020a9b6164e69389155e1e66fd03..19a1df3a82778178212f951cc8970fe21bf9fb00 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildSpawnData.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildSpawnData.java
@@ -5,29 +5,29 @@
 package org.chromium.content.browser;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.os.IBinder;
 
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
-import org.chromium.base.process_launcher.FileDescriptorInfo;
 import org.chromium.content.browser.ChildProcessLauncher.LaunchCallback;
 
 /** Contains the information necessary to start a child process. */
 class ChildSpawnData {
     private final Context mContext;
-    private final String[] mCommandLine;
-    private final FileDescriptorInfo[] mFilesToBeMapped;
+    private final Bundle mServiceBundle;
+    private final Bundle mConnectionBundle;
     private final LaunchCallback mLaunchCallback;
     private final IBinder mChildProcessCallback;
     private final boolean mInSandbox;
     private final boolean mAlwaysInForeground;
     private final ChildProcessCreationParams mCreationParams;
 
-    ChildSpawnData(Context context, String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
+    ChildSpawnData(Context context, Bundle serviceBundle, Bundle connectionBundle,
             LaunchCallback launchCallback, IBinder childProcessCallback, boolean inSandbox,
             boolean alwaysInForeground, ChildProcessCreationParams creationParams) {
         mContext = context;
-        mCommandLine = commandLine;
-        mFilesToBeMapped = filesToBeMapped;
+        mServiceBundle = serviceBundle;
+        mConnectionBundle = connectionBundle;
         mLaunchCallback = launchCallback;
         mChildProcessCallback = childProcessCallback;
         mInSandbox = inSandbox;
@@ -39,12 +39,12 @@ class ChildSpawnData {
         return mContext;
     }
 
-    String[] getCommandLine() {
-        return mCommandLine;
+    Bundle getServiceBundle() {
+        return mServiceBundle;
     }
 
-    FileDescriptorInfo[] getFilesToBeMapped() {
-        return mFilesToBeMapped;
+    Bundle getConnectionBundle() {
+        return mConnectionBundle;
     }
 
     LaunchCallback getLaunchCallback() {