Moving some CPL logic to CPLH.

content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherIntegrationTest.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.browser;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.support.test.filters.MediumTest;
 
@@ skipping 25 matching lines @@
     @Rule
     public final ContentShellActivityTestRule mActivityTestRule =
             new ContentShellActivityTestRule();
 
     private static class TestChildProcessConnectionFactory
             implements ChildConnectionAllocator.ConnectionFactory {
         private final List<TestChildProcessConnection> mConnections = new ArrayList<>();
 
         @Override
         public ChildProcessConnection createConnection(ChildSpawnData spawnData,
-                ChildProcessConnection.DeathCallback deathCallback,
-                Bundle childProcessCommonParameters, String serviceClassName) {
+                ChildProcessConnection.DeathCallback deathCallback, String serviceClassName) {
             TestChildProcessConnection connection = new TestChildProcessConnection(
                     spawnData.getContext(), deathCallback, serviceClassName,
-                    childProcessCommonParameters, spawnData.getCreationParams());
+                    spawnData.getServiceBundle(), spawnData.getCreationParams());
             mConnections.add(connection);
             return connection;
         }
 
         public List<TestChildProcessConnection> getConnections() {
             return mConnections;
         }
     }
 
     private static class TestChildProcessConnection extends ChildProcessConnection {
@@ skipping 76 matching lines @@
         ChildProcessLauncherTestUtils.runOnLauncherThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 Assert.assertEquals(2, connections.size());
                 // connections.get(0).didDropBothInitialAndImportantBindings();
                 connections.get(1).throwIfDroppedBothInitialAndStrongBinding();
             }
         });
     }
 }