Making ChildConnectionAllocator simpler.

content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java

 // Copyright 2014 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 597 matching lines @@
     }
 
     private static void enqueuePendingSpawnForTesting(final Context context,
             final String[] commandLine, final ChildProcessCreationParams creationParams,
             final boolean inSandbox) {
         ChildProcessLauncherTestUtils.runOnLauncherThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 String packageName = creationParams != null ? creationParams.getPackageName()
                                                             : context.getPackageName();
-                ChildConnectionAllocator allocator =
-                        ChildConnectionAllocator.getAllocator(context, packageName, inSandbox);
+                ChildConnectionAllocator allocator = ChildProcessLauncher.getConnectionAllocator(
+                        context, packageName, inSandbox);
                 allocator.enqueuePendingQueueForTesting(new ChildSpawnData(context, commandLine,
                         1 /* childProcessId */, new FileDescriptorInfo[0],
                         null /* launchCallback */, null /* childProcessCallback */,
                         true /* inSandbox */, false /* alwaysInForeground */, creationParams));
             }
         });
     }
 
     private static int allocatedSandboxedConnectionsCountForTesting(
             final Context context, final String packageName) {
         return ChildProcessLauncherTestUtils.runOnLauncherAndGetResult(
                 new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, true /*isSandboxed */)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, true /*isSandboxed */)
                                 .allocatedConnectionsCountForTesting();
                     }
                 });
     }
 
     private static BaseChildProcessConnection[] getSandboxedConnectionArrayForTesting(
             final Context context, final String packageName) {
         return ChildProcessLauncherTestUtils.runOnLauncherAndGetResult(
                 new Callable<BaseChildProcessConnection[]>() {
                     @Override
                     public BaseChildProcessConnection[] call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, true /*isSandboxed */)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, true /*isSandboxed */)
                                 .connectionArrayForTesting();
                     }
                 });
     }
 
     private static int pendingSpawnsCountForTesting(
             final Context context, final String packageName, final boolean inSandbox) {
         return ChildProcessLauncherTestUtils.runOnLauncherAndGetResult(
                 new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, inSandbox)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, inSandbox)
                                 .pendingSpawnsCountForTesting();
                     }
                 });
     }
 
     /**
      * Returns the number of Chrome's sandboxed connections.
      */
     private int allocatedChromeSandboxedConnectionsCount() {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         return allocatedSandboxedConnectionsCountForTesting(context, context.getPackageName());
     }
 
     private ChildProcessCreationParams getDefaultChildProcessCreationParams(String packageName) {
         return new ChildProcessCreationParams(packageName, false /* isExternalService */,
                 LibraryProcessType.PROCESS_CHILD, false /* bindToCallerCheck */);
     }
 
     private void triggerConnectionSetup(final BaseChildProcessConnection connection) {
         ChildProcessLauncherTestUtils.runOnLauncherThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArguments,
                         1 /* childProcessId */, new FileDescriptorInfo[0],
                         null /* launchCallback */, null /* childProcessCallback */);
             }
         });
     }
 }