diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml index 3c8a37d788dd7f..37bd82d4b5feca 100644 --- a/android_webview/apk/java/AndroidManifest.xml +++ b/android_webview/apk/java/AndroidManifest.xml @@ -61,8 +61,6 @@ {% endif %} - {% set num_sandboxed_services = 20 %} diff --git a/android_webview/test/shell/AndroidManifest.xml b/android_webview/test/shell/AndroidManifest.xml index 4942179a7e3c5c..1d1f4095fc5f2a 100644 --- a/android_webview/test/shell/AndroidManifest.xml +++ b/android_webview/test/shell/AndroidManifest.xml @@ -42,8 +42,6 @@ - diff --git a/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java b/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java index 9eacf14ab24151..d39bf6ba8b12ef 100644 --- a/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java +++ b/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java @@ -82,17 +82,14 @@ public ChildProcessConnection createConnection(Context context, ComponentName se * AndroidManifest.xml. */ public static ChildConnectionAllocator create(Context context, Handler launcherHandler, - String packageName, String serviceClassNameManifestKey, - String numChildServicesManifestKey, boolean bindToCaller, boolean bindAsExternalService, - boolean useStrongBinding) { - String serviceClassName = null; + String packageName, String serviceClassName, String numChildServicesManifestKey, + boolean bindToCaller, boolean bindAsExternalService, boolean useStrongBinding) { int numServices = -1; PackageManager packageManager = context.getPackageManager(); try { ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA); if (appInfo.metaData != null) { - serviceClassName = appInfo.metaData.getString(serviceClassNameManifestKey); numServices = appInfo.metaData.getInt(numChildServicesManifestKey, -1); } } catch (PackageManager.NameNotFoundException e) { diff --git a/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java index 4de0860c7524fc..54ced40e9342fd 100644 --- a/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java +++ b/base/test/android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java @@ -135,7 +135,7 @@ private MultiprocessTestClientLauncher(String[] commandLine, FileDescriptorInfo[ if (sConnectionAllocator == null) { sConnectionAllocator = ChildConnectionAllocator.create( ContextUtils.getApplicationContext(), sLauncherHandler, - "org.chromium.native_test", "org.chromium.native_test.TEST_CLIENT_SERVICE_NAME", + "org.chromium.native_test", "org.chromium.base.MultiprocessTestClientService", "org.chromium.native_test.NUM_TEST_CLIENT_SERVICES", false /* bindToCaller */, false /* bindAsExternalService */, false /* useStrongBinding */); } diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml index 471c357e2c159a..526306a1e1fe0a 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -1033,8 +1033,6 @@ by a child template that "extends" this file. {% set num_sandboxed_services = 20 %} - {% for i in range(num_sandboxed_services) %}