Making ChildConnectionAllocator simpler.

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

Index: content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
index dbb534f149f7299a4f3bfe80fbd90b246c764309..a5dc1617556eaf252f4e1e5d95a52cbf7866603b 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
@@ -615,8 +615,8 @@ public class ChildProcessLauncherTest {
             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 */,
@@ -631,8 +631,8 @@ public class ChildProcessLauncherTest {
                 new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, true /*isSandboxed */)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, true /*isSandboxed */)
                                 .allocatedConnectionsCountForTesting();
                     }
                 });
@@ -644,8 +644,8 @@ public class ChildProcessLauncherTest {
                 new Callable<BaseChildProcessConnection[]>() {
                     @Override
                     public BaseChildProcessConnection[] call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, true /*isSandboxed */)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, true /*isSandboxed */)
                                 .connectionArrayForTesting();
                     }
                 });
@@ -657,8 +657,8 @@ public class ChildProcessLauncherTest {
                 new Callable<Integer>() {
                     @Override
                     public Integer call() {
-                        return ChildConnectionAllocator
-                                .getAllocator(context, packageName, inSandbox)
+                        return ChildProcessLauncher
+                                .getConnectionAllocator(context, packageName, inSandbox)
                                 .pendingSpawnsCountForTesting();
                     }
                 });