Making ChildConnectionAllocator simpler.

content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2

 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright (c) 2012 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.
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.content_browsertests_apk">
@@ skipping 23 matching lines @@
             </intent-filter>
         </activity>
         <!-- The following service entries exist in order to allow us to
              start more than one sandboxed process. -->
 
         <!-- NOTE: If you change the values of "android:process" for any of the below services,
              you also need to update kHelperProcessExecutableName in chrome_constants.cc. -->
         {% set num_sandboxed_services = 20 %}
         <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
                    android:value="{{ num_sandboxed_services }}"/>
+        <meta-data android:name="org.chromium.content.browser.SANDBOXED_SERVICES_NAME"
+                   android:value="org.chromium.content.app.SandboxedProcessService"/>
         {% for i in range(num_sandboxed_services) %}
         <service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}"
                  android:process=":sandboxed_process{{ i }}"
                  android:isolatedProcess="true"
                  android:exported="false" />
         {% endfor %}
 
         {% set num_privileged_services = 3 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
+        <meta-data android:name="org.chromium.content.browser.PRIVILEGED_SERVICES_NAME"
+                   android:value="org.chromium.content.app.PrivilegedProcessService"/>
         {% for i in range(num_privileged_services) %}
         <service android:name="org.chromium.content.app.PrivilegedProcessService{{ i }}"
                  android:process=":privileged_process{{ i }}"
                  android:isolatedProcess="false"
                  android:exported="false" />
         {% endfor %}
 
     </application>
 
     <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
             android:label="ContentBrowserTests"
             android:targetPackage="org.chromium.content_browsertests_apk"/>
 </manifest>