Adding a new annotation to set ChildProcessAllocator settings in tests.

chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java

 // Copyright 2015 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.chrome.browser;
 
 import android.content.Context;
 import android.support.test.filters.LargeTest;
 import android.test.MoreAsserts;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.chrome.test.util.PrerenderTestHelper;
 import org.chromium.content.browser.BindingManager;
 import org.chromium.content.browser.ChildProcessConnection;
 import org.chromium.content.browser.ChildProcessLauncher;
+import org.chromium.content.browser.test.ChildProcessAllocatorSettings;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.PageTransition;
 
 import java.util.concurrent.Callable;
 
 /**
@@ skipping 458 matching lines @@
         MoreAsserts.assertNotEqual(pid1, pid2);
 
         assertTrue(mBindingManager.getVisibilityCalls(pid1).contains("DETERMINED;"));
         assertTrue(mBindingManager.getVisibilityCalls(pid2).contains("DETERMINED;"));
     }
 
     /**
      * Verifies that BindingManager.releaseAllModerateBindings() is called once all the sandboxed
      * services are allocated.
      */
-    @CommandLineFlags.Add(ChildProcessLauncher.SWITCH_NUM_SANDBOXED_SERVICES_FOR_TESTING + "=4")
+    @ChildProcessAllocatorSettings(sandboxedServiceCount = 4)

[boliu, 2017/04/10 18:43:41]

does this work yet for junit3 tests?

[Jay Civelli, 2017/04/10 19:43:15]

I don't see why the version of junit should impact it. As long as we are running
the tests from our test runner, it should run the assertion hook which sets the
values accordingly (regardless of how the list of tests was retrieved).

     @LargeTest
     @Feature({"ProcessManagement"})
     public void testReleaseAllModerateBindings() throws InterruptedException {
         final TabCreator tabCreator = getActivity().getCurrentTabCreator();
         final Tab[] tabs = new Tab[3];
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 // Foreground tab.
                 tabs[0] = tabCreator.createNewTab(
@@ skipping 126 matching lines @@
         super.tearDown();
     }
 
     /**
      * @return the index of the given tab in the current tab model
      */
     private int indexOf(Tab tab) {
         return getActivity().getCurrentTabModel().indexOf(tab);
     }
 }