Moving some CPL logic to CPLH.

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestUtils.java

 // Copyright 2017 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_shell_apk;
 
 import android.content.Context;
 
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.base.process_launcher.FileDescriptorInfo;
 import org.chromium.base.process_launcher.IChildProcessService;
 import org.chromium.content.browser.ChildProcessConnection;
-import org.chromium.content.browser.ChildProcessLauncher;
+import org.chromium.content.browser.ChildProcessLauncherHelper;
 import org.chromium.content.browser.LauncherThread;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.Semaphore;
 
 /** An assortment of static methods used in tests that deal with launching child processes. */
 public final class ChildProcessLauncherTestUtils {
     // Do not instanciate, use static methods instead.
     private ChildProcessLauncherTestUtils() {}
@@ skipping 24 matching lines @@
         }
         try {
             FutureTask<R> task = new FutureTask<R>(callable);
             LauncherThread.post(task);
             return task.get();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static ChildProcessConnection startInternalForTesting(final Context context,
-            final String[] commandLine, final FileDescriptorInfo[] filesToMap,
+    public static ChildProcessLauncherHelper startForTesting(final Context context,
+            final String[] commandLine, final FileDescriptorInfo[] filesToBeMapped,
             final ChildProcessCreationParams params) {
+        return runOnLauncherAndGetResult(new Callable<ChildProcessLauncherHelper>() {
+            @Override
+            public ChildProcessLauncherHelper call() {
+                return ChildProcessLauncherHelper.createAndStartForTesting(0L /* nativePointer */,
+                        commandLine, filesToBeMapped, params, true /* inSandbox */,
+                        false /* alwaysInForeground */);
+            }
+        });
+    }
+
+    public static ChildProcessConnection getConnection(
+            final ChildProcessLauncherHelper childProcessLauncher) {
         return runOnLauncherAndGetResult(new Callable<ChildProcessConnection>() {
             @Override
             public ChildProcessConnection call() {
-                return ChildProcessLauncher.startInternal(context, commandLine, filesToMap,
-                        null /* launchCallback */, null /* childProcessCallback */,
-                        true /* inSandbox */, false /* alwaysInForeground */, params);
+                return childProcessLauncher.getChildProcessConnection();
             }
         });
     }
 
     // Retrieves the PID of the passed in connection on the launcher thread as to not assert.
     public static int getConnectionPid(final ChildProcessConnection connection) {
         return runOnLauncherAndGetResult(new Callable<Integer>() {
             @Override
             public Integer call() {
                 return connection.getPid();
@@ skipping 36 matching lines @@
     public static IChildProcessService getConnectionService(
             final ChildProcessConnection connection) {
         return runOnLauncherAndGetResult(new Callable<IChildProcessService>() {
             @Override
             public IChildProcessService call() {
                 return connection.getService();
             }
         });
     }
 }