Support ChildProcessAllocatorSettings in JUnit4 tests

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
index 8303e01db6d8022a712c3d39b438cd6d41a21e09..349ef347f969a66d90666149d0e3657afa52064b 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
@@ -13,6 +13,7 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;
 import org.chromium.base.test.BaseTestResult;
 import org.chromium.base.test.util.DisableIfSkipCheck;
 import org.chromium.base.test.util.RestrictionSkipCheck;
@@ -21,7 +22,7 @@ import org.chromium.chrome.browser.vr_shell.VrClassesWrapper;
 import org.chromium.chrome.browser.vr_shell.VrDaydreamApi;
 import org.chromium.chrome.test.util.ChromeDisableIf;
 import org.chromium.chrome.test.util.ChromeRestriction;
-import org.chromium.content.browser.test.ContentInstrumentationTestRunner;
+import org.chromium.content.browser.test.ChildProcessAllocatorSettingsHook;
 import org.chromium.policy.test.annotations.Policies;
 import org.chromium.ui.base.DeviceFormFactor;
 
@@ -36,9 +37,7 @@ import java.util.concurrent.FutureTask;
  *  An Instrumentation test runner that optionally spawns a test HTTP server.
  *  The server's root directory is the device's external storage directory.
  */
-public class ChromeInstrumentationTestRunner extends ContentInstrumentationTestRunner {
-    private static final String TAG = "ChromeInstrumentationTestRunner";
-
+public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {
     @Override
     public void onCreate(Bundle arguments) {
         super.onCreate(arguments);
@@ -51,6 +50,7 @@ public class ChromeInstrumentationTestRunner extends ContentInstrumentationTestR
         result.addSkipCheck(new ChromeDisableIfSkipCheck(getTargetContext()));
 
         result.addPreTestHook(Policies.getRegistrationHook());
+        result.addPreTestHook(new ChildProcessAllocatorSettingsHook());
     }
 
     static class ChromeRestrictionSkipCheck extends RestrictionSkipCheck {