Adding a new annotation to set ChildProcessAllocator settings in tests.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

 // Copyright 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.
 
 package org.chromium.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.text.TextUtils;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.CpuFeatures;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.Linker;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.base.process_launcher.FileDescriptorInfo;
 import org.chromium.content.app.ChromiumLinkerParams;
 import org.chromium.content.app.PrivilegedProcessService;
@@ skipping 193 matching lines @@
     private static ChildConnectionAllocator sPrivilegedChildConnectionAllocator;
 
     private static final boolean SPARE_CONNECTION_ALWAYS_IN_FOREGROUND = false;
 
     private static final String NUM_SANDBOXED_SERVICES_KEY =
             "org.chromium.content.browser.NUM_SANDBOXED_SERVICES";
     private static final String NUM_PRIVILEGED_SERVICES_KEY =
             "org.chromium.content.browser.NUM_PRIVILEGED_SERVICES";
     private static final String SANDBOXED_SERVICES_NAME_KEY =
             "org.chromium.content.browser.SANDBOXED_SERVICES_NAME";
-    // Overrides the number of available sandboxed services.
+
+    // Used by tests to override the default sandboxed service settings.
+    private static int sSandboxedServicesCountForTesting = -1;
+    private static String sSandboxedServicesNameForTesting;
+
     @VisibleForTesting
-    public static final String SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING = "num-sandboxed-services";
-    public static final String SWITCH_SANDBOXED_SERVICES_NAME_FOR_TESTING =
-            "sandboxed-services-name";
+    public static void setSanboxServicesSettingsForTesting(int serviceCount, String serviceName) {
+        sSandboxedServicesCountForTesting = serviceCount;
+        sSandboxedServicesNameForTesting = serviceName;
+    }
 
     static int getNumberOfServices(Context context, boolean inSandbox, String packageName) {
         int numServices = -1;
-        if (inSandbox
-                && CommandLine.getInstance().hasSwitch(
-                           SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING)) {
-            String value = CommandLine.getInstance().getSwitchValue(
-                    SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING);
-            if (!TextUtils.isEmpty(value)) {
-                try {
-                    numServices = Integer.parseInt(value);
-                } catch (NumberFormatException e) {
-                    Log.w(TAG, "The value of --num-sandboxed-services is formatted wrongly: "
-                                    + value);
-                }
-            }
+        if (inSandbox && sSandboxedServicesCountForTesting != -1) {
+            numServices = sSandboxedServicesCountForTesting;
         } else {
             try {
                 PackageManager packageManager = context.getPackageManager();
                 ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName,
                         PackageManager.GET_META_DATA);
                 if (appInfo.metaData != null) {
                     numServices = appInfo.metaData.getInt(inSandbox
                             ? NUM_SANDBOXED_SERVICES_KEY : NUM_PRIVILEGED_SERVICES_KEY, -1);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 throw new RuntimeException("Could not get application info");
             }
         }
         if (numServices < 0) {
             throw new RuntimeException("Illegal meta data value for number of child services");
         }
         return numServices;
     }
 
     private static String getClassNameOfService(Context context, boolean inSandbox,
             String packageName) {
         if (!inSandbox) {
             return PrivilegedProcessService.class.getName();
         }
-        if (CommandLine.getInstance().hasSwitch(SWITCH_SANDBOXED_SERVICES_NAME_FOR_TESTING)) {
-            return CommandLine.getInstance().getSwitchValue(
-                    SWITCH_SANDBOXED_SERVICES_NAME_FOR_TESTING);
+
+        if (!TextUtils.isEmpty(sSandboxedServicesNameForTesting)) {
+            return sSandboxedServicesNameForTesting;
         }
 
         String serviceName = null;
         try {
             PackageManager packageManager = context.getPackageManager();
             ApplicationInfo appInfo =
                     packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
             if (appInfo.metaData != null) {
                 serviceName = appInfo.metaData.getString(SANDBOXED_SERVICES_NAME_KEY);
             }
@@ skipping 600 matching lines @@
 
         try {
             ((ChildProcessConnectionImpl) sServiceMap.get(pid)).crashServiceForTesting();
         } catch (RemoteException ex) {
             return false;
         }
 
         return true;
     }
 }